aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysdeps/unix/sysv/linux/x86/readelflib.c (renamed from sysdeps/unix/sysv/linux/i386/readelflib.c)4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/readelflib.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/readelflib.c b/sysdeps/unix/sysv/linux/x86/readelflib.c
index 05f1827..3e83419 100644
--- a/sysdeps/unix/sysv/linux/i386/readelflib.c
+++ b/sysdeps/unix/sysv/linux/x86/readelflib.c
@@ -44,7 +44,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
/* X32 libraries are always libc.so.6+. */
file_flag = FLAG_X8664_LIBX32|FLAG_ELF_LIBC6;
break;
-#ifndef SKIP_EM_IA_64
+#ifndef __x86_64__
case EM_IA_64:
if (elf_header->e_ident[EI_CLASS] == ELFCLASS64)
{
@@ -59,7 +59,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
break;
/* Fall through. */
default:
-#ifndef SKIP_EM_IA_64
+#ifndef __x86_64__
failed:
#endif
error (0, 0, _("%s is for unknown machine %d.\n"),
diff --git a/sysdeps/unix/sysv/linux/x86_64/readelflib.c b/sysdeps/unix/sysv/linux/x86_64/readelflib.c
deleted file mode 100644
index 4c4e5f9..0000000
--- a/sysdeps/unix/sysv/linux/x86_64/readelflib.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SKIP_EM_IA_64
-#include <sysdeps/unix/sysv/linux/i386/readelflib.c>