about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
-rw-r--r--elf/link.h8
2 files changed, 4 insertions, 6 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 34be12e769..06aeb7590a 100644
--- 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 f7bca97e80..6d284cbbde 100644
--- 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