[commits] r8129 - in /fsf/trunk/ports: ChangeLog.mips sysdeps/unix/sysv/linux/mips/readelflib.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Mar 19 00:04:00 2009
New Revision: 8129

Log:
Import glibc-ports-mainline for 2009-03-19

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/readelflib.c

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Thu Mar 19 00:04:00 2009
@@ -1,3 +1,14 @@
+2009-03-18  Maciej W. Rozycki  <macro@xxxxxxxxxxxxxxxx>
+
+	* 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  <r0bertz@xxxxxxxxxx>
+
+	[BZ #7074]
+	* sysdeps/unix/sysv/linux/mips/readelflib.c (process_elf_file):
+	Fix the condition used to annotate n32 objects.
+
 2009-03-17  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/getsysstats.c (GET_NPROCS_PARSER):

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/readelflib.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/readelflib.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/readelflib.c Thu Mar 19 00:04:00 2009
@@ -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 <aoliva@xxxxxxxxxx>
    Based on work ../x86_64/readelflib.c,
@@ -39,11 +40,13 @@
 
   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