PATCH] x86: Rename readelflib.c
Commit Message
On Fri, Dec 4, 2020 at 1:15 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> 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.
>
Here is the patch just to rename. I have a followup patch for ldconfig
to add ISA level check to glibc-hwcaps
Comments
* H. J. Lu:
> On Fri, Dec 4, 2020 at 1:15 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>>
>> 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.
>>
>
> Here is the patch just to rename. I have a followup patch for ldconfig
> to add ISA level check to glibc-hwcaps
I think this is okay. It would also make sense to process EM_IA_64
unconditionally in support of qemu-user.
On Sun, Dec 6, 2020 at 6:09 AM Florian Weimer <fw@deneb.enyo.de> wrote:
>
> * H. J. Lu:
>
> > On Fri, Dec 4, 2020 at 1:15 PM H.J. Lu <hjl.tools@gmail.com> wrote:
> >>
> >> 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.
> >>
> >
> > Here is the patch just to rename. I have a followup patch for ldconfig
> > to add ISA level check to glibc-hwcaps
>
> I think this is okay. It would also make sense to process EM_IA_64
> unconditionally in support of qemu-user.
I am checking my patch as is.
Thanks.
From 505716a17248207709bb325dbbb1723b228b9553 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 4 Dec 2020 12:24:39 -0800
Subject: [PATCH] x86: Rename readelflib.c
Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove
x86_64/readelflib.c.
---
sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c | 4 ++--
sysdeps/unix/sysv/linux/x86_64/readelflib.c | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
rename sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c (98%)
delete mode 100644 sysdeps/unix/sysv/linux/x86_64/readelflib.c
similarity index 98%
rename from sysdeps/unix/sysv/linux/i386/readelflib.c
rename to 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"),
deleted file mode 100644
@@ -1,2 +0,0 @@
-#define SKIP_EM_IA_64
-#include <sysdeps/unix/sysv/linux/i386/readelflib.c>
--
2.28.0