From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 4 Dec 2020 20:24:39 +0000 (-0800)
Subject: x86: Rename readelflib.c
X-Git-Tag: glibc-2.33~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=088e9625378f25607acff3daf7a79cbdee497043;p=thirdparty%2Fglibc.git

x86: Rename readelflib.c

Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove
x86_64/readelflib.c.
---

diff --git a/sysdeps/unix/sysv/linux/i386/readelflib.c b/sysdeps/unix/sysv/linux/x86/readelflib.c
similarity index 98%
rename from sysdeps/unix/sysv/linux/i386/readelflib.c
rename to sysdeps/unix/sysv/linux/x86/readelflib.c
index 05f182734a2..3e83419f5b7 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 4c4e5f9d1a2..00000000000
--- 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>