2002-12-30 Roland McGrath <roland@redhat.com>

	* Makefile.am [LINUX && X86_64]: Remove cruft.
	* linux/x86_64/errnoent1.h: New file.
	* linux/x86_64/ioctlent1.h: New file.
	* linux/x86_64/signalent1.h: New file.
	* linux/x86_64/syscallent1.h: New file.
	* linux/x86_64/i386-headers.diff: File removed.
	* linux/x86_64/makeheaders.sh: File removed.
	* linux/x86_64/Makefile.in: File removed.

diff --git a/Makefile.am b/Makefile.am
index 8f36fa929466e5f67dc014c9f6ccfdef8eb61fc8..15e7e5f04ee63f6c4e2e4c68aebc810ec125409f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,8 @@ EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
             linux/sparc/syscall.h linux/sparc/syscall1.h \
             linux/sparc/syscallent.h linux/sparc/syscallent1.h \
             linux/x86_64/syscallent.h linux/x86_64/gentab.pl \
-            linux/x86_64/i386-headers.diff linux/x86_64/makeheaders.sh \
+            linux/x86_64/errnoent1.h linux/x86_64/ioctlent1.h \
+            linux/x86_64/signalent1.h linux/x86_64/syscallent1.h \
             freebsd/ioctlent.sh \
             freebsd/syscalls.cat freebsd/syscalls.pl freebsd/syscalls.print \
             freebsd/i386/errnoent.h freebsd/i386/ioctlent.h \
@@ -55,17 +56,3 @@ EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
             svr4/signalent.h svr4/syscall.h svr4/syscallent.h \
             debian/changelog debian/control debian/copyright \
             debian/postinst debian/prerm debian/rules strace.spec
-
-if LINUX
-if X86_64
-
-BUILT_SOURCES = linux/x86_64/syscallent1.h linux/x86_64/syscall1.h \
-               linux/x86_64/signalent1.h linux/x86_64/ioctls1.h \
-               linux/x86_64/ioctlent1.h linux/x86_64/ioctldefs1.h \
-               linux/x86_64/errnoent1.h linux/x86_64/dummy1.h
-
-$(BUILT_SOURCES): $(srcdir)/linux/x86_64/makeheaders.sh
-       cd linux/x86_64 && $(SHELL) ./makeheaders.sh
-
-endif X86_64
-endif LINUX

diff --git a/linux/x86_64/Makefile.in b/linux/x86_64/Makefile.in
deleted file mode 100644 (file)
index 2e0378c..0000000
--- a/linux/x86_64/Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# $Id$
-#
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-CC = @CC@
-CPP = @CPP@
-SHELL = /bin/sh
-
-DEFS = @DEFS@
-LDLIBS = @LIBS@
-
-CFLAGS = -g
-LDFLAGS = -g
-WARNFLAGS = @WARNFLAGS@
-
-CPPFLAGS =
-INCLUDES = -I. -I.. -I$(srcdir)/.. -I../.. -I$(srcdir)
-
-includedir = @includedir@
-
-ia32headers= syscallent1.h syscall1.h signalent1.h ioctls1.h \
-       ioctlent1.h ioctldefs1.h errnoent1.h dummy1.h
-
-all: $(ia32headers)
-
-$(ia32headers):
-       $(SHELL) ./makeheaders.sh
-
-clean:
-       rm -f ioctlent.c *.raw *.tmp *.o ioctlsort *1.h
-
-distclean: clean
-       rm -f Makefile
-
-maintainer-clean: distclean
-
-install:

diff --git a/linux/x86_64/errnoent1.h b/linux/x86_64/errnoent1.h
new file mode 100644 (file)
index 0000000..a894827
--- /dev/null
+++ b/linux/x86_64/errnoent1.h
@@ -0,0 +1,2 @@
+/* Our second set comes from the i386 files.  */
+#include "../errnoent.h"

diff --git a/linux/x86_64/i386-headers.diff b/linux/x86_64/i386-headers.diff
deleted file mode 100644 (file)
index 652cdba..0000000
--- a/linux/x86_64/i386-headers.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN syscallent1.h syscallent1.h
---- syscallent1.h      Fri Aug  3 14:27:54 2001
-+++ syscallent1.h      Mon Sep  9 16:37:19 2002
-@@ -50,7 +50,7 @@
-       { 3,    TF,     sys_chown,              "lchown"        }, /* 16 */
- #endif
-       { 0,    0,      sys_break,              "break"         }, /* 17 */
--      { 2,    TF,     sys_oldstat,            "oldstat"       }, /* 18 */
-+      { 2,    TF,     printargs,              "oldstat"       }, /* 18 */
-       { 3,    0,      sys_lseek,              "lseek"         }, /* 19 */
-       { 0,    0,      sys_getpid,             "getpid"        }, /* 20 */
-       { 5,    TF,     sys_mount,              "mount"         }, /* 21 */
-@@ -60,7 +60,7 @@
-       { 1,    0,      sys_stime,              "stime"         }, /* 25 */
-       { 4,    0,      sys_ptrace,             "ptrace"        }, /* 26 */
-       { 1,    0,      sys_alarm,              "alarm"         }, /* 27 */
--      { 2,    0,      sys_oldfstat,           "oldfstat"      }, /* 28 */
-+      { 2,    0,      printargs,              "oldfstat"      }, /* 28 */
-       { 0,    TS,     sys_pause,              "pause"         }, /* 29 */
-       { 2,    TF,     sys_utime,              "utime"         }, /* 30 */
-       { 2,    0,      sys_stty,               "stty"          }, /* 31 */
-@@ -116,7 +116,7 @@
-       { 2,    0,      sys_setgroups,          "setgroups"     }, /* 81 */
-       { 1,    0,      sys_oldselect,          "oldselect"     }, /* 82 */
-       { 2,    TF,     sys_symlink,            "symlink"       }, /* 83 */
--      { 2,    TF,     sys_oldlstat,           "oldlstat"      }, /* 84 */
-+      { 2,    TF,     printargs,              "oldlstat"      }, /* 84 */
-       { 3,    TF,     sys_readlink,           "readlink"      }, /* 85 */
-       { 1,    TF,     sys_uselib,             "uselib"        }, /* 86 */
-       { 1,    TF,     sys_swapon,             "swapon"        }, /* 87 */
-

diff --git a/linux/x86_64/ioctlent1.h b/linux/x86_64/ioctlent1.h
new file mode 100644 (file)
index 0000000..a44b0ae
--- /dev/null
+++ b/linux/x86_64/ioctlent1.h
@@ -0,0 +1,2 @@
+/* Our second set comes from the i386 files.  */
+#include "../ioctlent.h"

diff --git a/linux/x86_64/makeheaders.sh b/linux/x86_64/makeheaders.sh
deleted file mode 100644 (file)
index 0b3b6ce..0000000
--- a/linux/x86_64/makeheaders.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-for i in ../*.h; do
-       NM=`basename $i .h`1.h
-       /bin/cp -vf $i $NM
-done
-
-patch -p0 < i386-headers.diff

diff --git a/linux/x86_64/signalent1.h b/linux/x86_64/signalent1.h
new file mode 100644 (file)
index 0000000..5c18d98
--- /dev/null
+++ b/linux/x86_64/signalent1.h
@@ -0,0 +1,2 @@
+/* Our second set comes from the i386 files.  */
+#include "../signalent.h"

diff --git a/linux/x86_64/syscallent1.h b/linux/x86_64/syscallent1.h
new file mode 100644 (file)
index 0000000..e9427d3
--- /dev/null
+++ b/linux/x86_64/syscallent1.h
@@ -0,0 +1,6 @@
+/* Our second set comes from the i386 files.
+   Only a couple of calls we cannot support without the i386 headers.  */
+
+#define sys_oldstat printargs
+#define sys_oldfstat printargs
+#include "../syscallent.h"