This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: riscv: fix elf parsing

On Thu, 08 Feb 2018 18:07:01 PST (-0800), wrote:

I think this one is obvious...  it was causing ldconfig to cache all
libraries with the wrong flags (soft float vs double), thus making the
cache useless.

	* sysdeps/unix/sysv/linux/riscv/readelflib.c
        (process_elf_file): Fix Elf64 flag parsing.

diff --git a/sysdeps/unix/sysv/linux/riscv/readelflib.c b/sysdeps/unix/sysv/linux/riscv/readelflib.c
index 6e249ff82f..7e27e0c1d6 100644
--- a/sysdeps/unix/sysv/linux/riscv/readelflib.c
+++ b/sysdeps/unix/sysv/linux/riscv/readelflib.c
@@ -43,6 +43,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
   ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
   Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header;
+  Elf64_Ehdr *elf64_header = (Elf64_Ehdr *) elf_header;
   int ret;
   long flags;

@@ -59,7 +60,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
       ret = process_elf64_file (file_name, lib, flag, osversion, soname,
 				file_contents, file_length);
-      flags = elf32_header->e_flags;
+      flags = elf64_header->e_flags;

   /* RISC-V linkers encode the floating point ABI as part of the ELF headers.  */

Sorry about that. I'm still a bit behind on my email from FOSDEM, but I noticed you committed this one. Thanks!

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]