diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-12-04 12:24:39 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-12-06 06:38:09 -0800 |
| commit | 088e9625378f25607acff3daf7a79cbdee497043 (patch) | |
| tree | 10044b1d4dcb6b96f757b7d49d7a13c935c047ac | |
| parent | f4f3b09111e9fa38fd485979a3e40b6cfa6a757d (diff) | |
| download | glibc-088e9625378f25607acff3daf7a79cbdee497043.tar.gz | |
x86: Rename readelflib.c
Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove
x86_64/readelflib.c.
| -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.c | 2 |
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 05f182734a..3e83419f5b 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 4c4e5f9d1a..0000000000 --- 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> |