From: "H.J. Lu" <hjl.tools@gmail.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] x86: Rename readelflib.c and remove EM_IA_64 support
Date: Fri, 4 Dec 2020 12:30:35 -0800 [thread overview]
Message-ID: <20201204203035.883371-1-hjl.tools@gmail.com> (raw)
Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove
x86_64/readelflib.c. Also remove EM_IA_64 support from i386 ldconfig.
---
sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c | 13 -------------
sysdeps/unix/sysv/linux/x86_64/readelflib.c | 2 --
2 files changed, 15 deletions(-)
rename sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c (90%)
delete mode 100644 sysdeps/unix/sysv/linux/x86_64/readelflib.c
diff --git a/sysdeps/unix/sysv/linux/i386/readelflib.c b/sysdeps/unix/sysv/linux/x86/readelflib.c
similarity index 90%
rename from sysdeps/unix/sysv/linux/i386/readelflib.c
rename to sysdeps/unix/sysv/linux/x86/readelflib.c
index 05f182734a..ccf9361edf 100644
--- a/sysdeps/unix/sysv/linux/i386/readelflib.c
+++ b/sysdeps/unix/sysv/linux/x86/readelflib.c
@@ -44,24 +44,11 @@ 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
- case EM_IA_64:
- if (elf_header->e_ident[EI_CLASS] == ELFCLASS64)
- {
- /* IA64 64bit libraries are always libc.so.6+. */
- file_flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6;
- break;
- }
- goto failed;
-#endif
case EM_386:
if (elf_header->e_ident[EI_CLASS] == ELFCLASS32)
break;
/* Fall through. */
default:
-#ifndef SKIP_EM_IA_64
-failed:
-#endif
error (0, 0, _("%s is for unknown machine %d.\n"),
file_name, elf_header->e_machine);
return 1;
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>
--
2.28.0
next reply other threads:[~2020-12-04 20:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 20:30 H.J. Lu [this message]
2020-12-04 21:05 ` Florian Weimer
2020-12-04 21:13 ` H.J. Lu
2020-12-04 21:15 ` H.J. Lu
2020-12-05 15:15 ` PATCH] x86: Rename readelflib.c H.J. Lu
2020-12-06 14:09 ` Florian Weimer
2020-12-06 14:37 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201204203035.883371-1-hjl.tools@gmail.com \
--to=hjl.tools@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).