x86: Rename readelflib.c and remove EM_IA_64 support

Message ID 20201204203035.883371-1-hjl.tools@gmail.com
State New
Headers show
Series
  • x86: Rename readelflib.c and remove EM_IA_64 support
Related show

Commit Message

DJ Delorie via Libc-alpha Dec. 4, 2020, 8:30 p.m.
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

-- 
2.28.0

Comments

Florian Weimer Dec. 4, 2020, 9:05 p.m. | #1
* H. J. Lu via Libc-alpha:

> 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.


I'm curious—what's the context for this change?

Do the remaining ia64 systems use an ia64 ldconfig?  (The latest CPUs
no longer support i386 IIRC.)
DJ Delorie via Libc-alpha Dec. 4, 2020, 9:13 p.m. | #2
On Fri, Dec 4, 2020 at 1:05 PM Florian Weimer <fw@deneb.enyo.de> wrote:
>

> * H. J. Lu via Libc-alpha:

>

> > 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.

>

> I'm curious—what's the context for this change?


It is a cleanup job while working on x86-64 ISA level support to ldconfig.

> Do the remaining ia64 systems use an ia64 ldconfig?  (The latest CPUs

> no longer support i386 IIRC.)


There is a separate, unrelated linux/ia64/readelflib.c.

-- 
H.J.
DJ Delorie via Libc-alpha Dec. 4, 2020, 9:15 p.m. | #3
On Fri, Dec 4, 2020 at 1:13 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>

> On Fri, Dec 4, 2020 at 1:05 PM Florian Weimer <fw@deneb.enyo.de> wrote:

> >

> > * H. J. Lu via Libc-alpha:

> >

> > > 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.

> >

> > I'm curious—what's the context for this change?

>

> It is a cleanup job while working on x86-64 ISA level support to ldconfig.

>

> > Do the remaining ia64 systems use an ia64 ldconfig?  (The latest CPUs

> > no longer support i386 IIRC.)

>

> There is a separate, unrelated linux/ia64/readelflib.c.


With this patch, you can no longer run i386 ldconfig on ia64.   I am not
even sure if it works today.

-- 
H.J.

Patch

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>