about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--elf.h1
-rw-r--r--elf/elf.h4
3 files changed, 6 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index bf2e2b1628..e29dee6293 100644
--- a/configure.in
+++ b/configure.in
@@ -115,7 +115,7 @@ gnu* | linux* | bsd4.4* | netbsd* | freebsd*)
   gnu_ld=yes gnu_as=yes
 esac
 case "$os" in
-gnu*elf* | linux* | sysv4* | solaris2*)
+gnu* | linux* | sysv4* | solaris2*)
   # These systems always use the ELF format.
   elf=yes
 esac
diff --git a/elf.h b/elf.h
new file mode 100644
index 0000000000..8a1764f956
--- /dev/null
+++ b/elf.h
@@ -0,0 +1 @@
+#include <elf/elf.h>
diff --git a/elf/elf.h b/elf/elf.h
index 433aa479e7..87cf1098ee 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -72,6 +72,10 @@ typedef struct
 #define EI_MAG3		3		/* File identification byte 3 index */
 #define ELFMAG3		'F'		/* Magic number byte 3 */
 
+/* Conglomeration of the identification bytes, for easy testing as a word.  */
+#define	ELFMAG		"\x7fELF"
+#define	SELFMAG		4
+
 #define EI_CLASS	4		/* File class byte index */
 #define ELFCLASSNONE	0		/* Invalid class */
 #define ELFCLASS32	1		/* 32-bit objects */