From: Joseph Myers Date: Wed, 18 Mar 2009 14:38:51 +0000 (+0000) Subject: 2009-03-18 Maciej W. Rozycki X-Git-Tag: glibc-2.16-ports-before-merge~635 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d69fd0cbd2ec67b2dc4ba1e23bac6b9ed6b947c5;p=thirdparty%2Fglibc.git 2009-03-18 Maciej W. Rozycki * sysdeps/unix/sysv/linux/mips/readelflib.c (process_elf_file): Use the Elf32_Ehdr type to check for EF_MIPS_ABI2 in the flags. --- diff --git a/ChangeLog.mips b/ChangeLog.mips index d4a38dca52f..6f4b038e786 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,8 @@ +2009-03-18 Maciej W. Rozycki + + * sysdeps/unix/sysv/linux/mips/readelflib.c (process_elf_file): + Use the Elf32_Ehdr type to check for EF_MIPS_ABI2 in the flags. + 2009-03-18 Zhang Le [BZ #7074] diff --git a/sysdeps/unix/sysv/linux/mips/readelflib.c b/sysdeps/unix/sysv/linux/mips/readelflib.c index 99fbaaca86c..547362f31f6 100644 --- a/sysdeps/unix/sysv/linux/mips/readelflib.c +++ b/sysdeps/unix/sysv/linux/mips/readelflib.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1999, 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2001, 2002, 2003, 2005, 2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Alexandre Oliva Based on work ../x86_64/readelflib.c, @@ -39,11 +40,13 @@ process_elf_file (const char *file_name, const char *lib, int *flag, if (elf_header->e_ident [EI_CLASS] == ELFCLASS32) { + Elf32_Ehdr *elf32_header = (Elf32_Ehdr *) elf_header; + ret = process_elf32_file (file_name, lib, flag, osversion, soname, file_contents, file_length); /* n32 libraries are always libc.so.6+. */ - if (!ret && (elf_header->e_flags & EF_MIPS_ABI2) != 0) + if (!ret && (elf32_header->e_flags & EF_MIPS_ABI2) != 0) *flag = FLAG_MIPS64_LIBN32|FLAG_ELF_LIBC6; } else