* elf/link.h: Include elfclass.h to define __ELF_NATIVE_CLASS.

	(ElfW, ELFW): Use it.
	* elf/Makefile (headers): Add elfclass.h.
	* sysdeps/wordsize-32/elfclass.h: New file.
	* sysdeps/wordsize-64/elfclass.h: New file.
	* sysdeps/alpha/Implies: Add wordsize-64.
	* sysdeps/i386/Implies: Add wordsize-32.
	* sysdeps/m68k/Implies: Add wordsize-32.
	* sysdeps/mips/Implies: Add wordsize-32.
	* sysdeps/sparc/Implies: Add wordsize-32.

diff --git a/ChangeLog b/ChangeLog
index 16f8c5b832592a55154e7a8e6b6d27ac91bd0de0..231facf9055b1998f85928f038fc77bd97005b9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 Mon Jun 10 06:14:03 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+       * elf/link.h: Include elfclass.h to define __ELF_NATIVE_CLASS.
+       (ElfW, ELFW): Use it.
+       * elf/Makefile (headers): Add elfclass.h.
+       * sysdeps/wordsize-32/elfclass.h: New file.
+       * sysdeps/wordsize-64/elfclass.h: New file.
+       * sysdeps/alpha/Implies: Add wordsize-64.
+       * sysdeps/i386/Implies: Add wordsize-32.
+       * sysdeps/m68k/Implies: Add wordsize-32.
+       * sysdeps/mips/Implies: Add wordsize-32.
+       * sysdeps/sparc/Implies: Add wordsize-32.
+
        * sysdeps/mach/hurd/dl-sysdep.c (__open): Define this instead of open.
        (__close, __mmap): Likewise define with __ names now.
 

diff --git a/elf/Makefile b/elf/Makefile
index 34be12e769dd642761950700beabbd4ccd702037..06aeb7590afdf8a03858ca90408ee699093c5aa7 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -20,7 +20,7 @@
 
 subdir         := elf
 
-headers                = elf.h link.h dlfcn.h
+headers                = elf.h elfclass.h link.h dlfcn.h
 routines       = init-first $(dl-routines) dl-open dl-symbol dl-support
 
 # The core dynamic linking functions are in libc for the static and

diff --git a/elf/link.h b/elf/link.h
index f7bca97e80f9e0b69c83c1127b99c5a03e352206..6d284cbbde0c4ef8f2cff0e5c03611ddeac56010 100644 (file)
--- a/elf/link.h
+++ b/elf/link.h
@@ -25,15 +25,13 @@ Cambridge, MA 02139, USA.  */
 
 #include <elf.h>
 
-#define __ELF_WORDSIZE 32      /* XXX */
-
 /* We use this macro to refer to ELF types independent of the native wordsize.
    `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'.  */
-#define ElfW(type)     _ElfW (Elf, __ELF_WORDSIZE, type)
-#define ELFW(type)     _ElfW (ELF, __ELF_WORDSIZE, type)
+#define ElfW(type)     _ElfW (Elf, __ELF_NATIVE_CLASS, type)
+#define ELFW(type)     _ElfW (ELF, __ELF_NATIVE_CLASS, type)
 #define _ElfW(e,w,t)   _ElfW_1 (e, w, _##t)
 #define _ElfW_1(e,w,t) e##w##t
-
+#include <elfclass.h>          /* Defines __ELF_NATIVE_CLASS.  */
 
 /* Rendezvous structure used by the run-time dynamic linker to communicate
    details of shared object loading to the debugger.  If the executable's

diff --git a/sysdeps/alpha/Implies b/sysdeps/alpha/Implies
index 93234096f0eae605624f1c7885ac928bc3d77fa3..37fee79d972974e8f587eacb10ef42e2ab8c50c5 100644 (file)
--- a/sysdeps/alpha/Implies
+++ b/sysdeps/alpha/Implies
@@ -1,2 +1,3 @@
+wordsize-64
 # Alpha uses IEEE 754 floating point.
 ieee754

diff --git a/sysdeps/i386/Implies b/sysdeps/i386/Implies
index 1610bfdc5b086b672acf5f6d17446701172096f9..d6acf04a8274e124bd1f61ea91498eb1d2d484d2 100644 (file)
--- a/sysdeps/i386/Implies
+++ b/sysdeps/i386/Implies
@@ -1 +1,2 @@
+wordsize-32
 ieee754

diff --git a/sysdeps/m68k/Implies b/sysdeps/m68k/Implies
index a67e1c2741f7c5e1de3650dda3c6cd05af0a4276..09dd873973c13d4df1ff0002c2be607541b41aee 100644 (file)
--- a/sysdeps/m68k/Implies
+++ b/sysdeps/m68k/Implies
@@ -1,2 +1,3 @@
+wordsize-32
 # 68k uses IEEE 754 floating point.
 ieee754

diff --git a/sysdeps/mips/Implies b/sysdeps/mips/Implies
index 60732cef94e651777638902f0caaf2aea533c534..5aeb9ae46018b880c3ab1c23bb86588491ecf21c 100644 (file)
--- a/sysdeps/mips/Implies
+++ b/sysdeps/mips/Implies
@@ -1,2 +1,3 @@
+wordsize-32
 # MIPS uses IEEE 754 floating point.
 ieee754

diff --git a/sysdeps/sparc/Implies b/sysdeps/sparc/Implies
index da719e170715a921d5eea9b6a1e778767983d955..8a2007c5ceff4747d13b5212ed711544b1605f14 100644 (file)
--- a/sysdeps/sparc/Implies
+++ b/sysdeps/sparc/Implies
@@ -1,2 +1,3 @@
+wordsize-32
 # SPARC uses IEEE 754 floating point.
 ieee754

diff --git a/sysdeps/wordsize-32/elfclass.h b/sysdeps/wordsize-32/elfclass.h
new file mode 100644 (file)
index 0000000..49411d6
--- /dev/null
+++ b/sysdeps/wordsize-32/elfclass.h
@@ -0,0 +1,5 @@
+/* This file specifies the native word size of the machine, which indicates
+   the ELF file class used for executables and shared objects on this
+   machine.  */
+
+#define __ELF_NATIVE_CLASS 32

diff --git a/sysdeps/wordsize-64/elfclass.h b/sysdeps/wordsize-64/elfclass.h
new file mode 100644 (file)
index 0000000..ac52904
--- /dev/null
+++ b/sysdeps/wordsize-64/elfclass.h
@@ -0,0 +1,5 @@
+/* This file specifies the native word size of the machine, which indicates
+   the ELF file class used for executables and shared objects on this
+   machine.  */
+
+#define __ELF_NATIVE_CLASS 64