[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r23129 - in /fsf/glibc-2_17-branch/libc: ./ elf/ ports/ ports/sysdeps/unix/sysv/linux/arm/ sysdeps/generic/

To: commits@xxxxxxxxxx
Subject: [Commits] r23129 - in /fsf/glibc-2_17-branch/libc: ./ elf/ ports/ ports/sysdeps/unix/sysv/linux/arm/ sysdeps/generic/
From: eglibc@xxxxxxxxxx
Date: Thu, 23 May 2013 00:03:24 -0000

Author: eglibc
Date: Thu May 23 00:03:22 2013
New Revision: 23129

Log:
Import glibc-2.17 for 2013-05-23

Modified:
    fsf/glibc-2_17-branch/libc/ChangeLog
    fsf/glibc-2_17-branch/libc/NEWS
    fsf/glibc-2_17-branch/libc/elf/cache.c
    fsf/glibc-2_17-branch/libc/ports/ChangeLog.arm
    fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
    fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
    fsf/glibc-2_17-branch/libc/sysdeps/generic/ldconfig.h

Modified: fsf/glibc-2_17-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_17-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_17-branch/libc/ChangeLog Thu May 23 00:03:22 2013
@@ -1,3 +1,9 @@
+2013-02-08  Carlos O'Donell  <carlos@xxxxxxxxxx>
+
+	[BZ #15006]
+	* sysdeps/generic/ldconfig.h: Define FLAG_ARM_LIBSF.
+	* elf/cache.c (print_entry): Add FLAG_ARM_LIBSF support.
+
 2013-03-30  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* po/de.po: Update from translation team.

Modified: fsf/glibc-2_17-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_17-branch/libc/NEWS (original)
+++ fsf/glibc-2_17-branch/libc/NEWS Thu May 23 00:03:22 2013
@@ -4,6 +4,12 @@
 
 Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
 using `glibc' in the "product" field.
+
+Version 2.17.1
+
+* The following bugs are resolved with this release:
+  15003, 15006, 15122.
+
 
 Version 2.17
 
@@ -23,7 +29,7 @@
   14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805,
   14807, 14811, 14815, 14821, 14822, 14824, 14828, 14831, 14833, 14835,
   14838, 14856, 14863, 14865, 14866, 14868, 14869, 14871, 14872, 14879,
-  14889, 14893, 14898, 14914, 15003.
+  14889, 14893, 14898, 14914.
 
 * Optimization of memcpy for MIPS.
 

Modified: fsf/glibc-2_17-branch/libc/elf/cache.c
==============================================================================
--- fsf/glibc-2_17-branch/libc/elf/cache.c (original)
+++ fsf/glibc-2_17-branch/libc/elf/cache.c Thu May 23 00:03:22 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
 
@@ -99,6 +99,10 @@
       break;
     case FLAG_AARCH64_LIB64:
       fputs (",AArch64", stdout);
+      break;
+    /* Uses the ARM soft-float ABI.  */
+    case FLAG_ARM_LIBSF:
+      fputs (",soft-float", stdout);
       break;
     case 0:
       break;

Modified: fsf/glibc-2_17-branch/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/ChangeLog.arm (original)
+++ fsf/glibc-2_17-branch/libc/ports/ChangeLog.arm Thu May 23 00:03:22 2013
@@ -1,3 +1,12 @@
+2013-02-08  Carlos O'Donell  <carlos@xxxxxxxxxx>
+
+	[BZ #15006]
+	* sysdeps/unix/sysv/linux/arm/dl-cache.h
+	[__ARM_PCS_VFP] (_dl_cache_check_flags): Allow plain FLAG_ELF_LIBC6.
+	[!__ARM_PCS_VFP] (_dl_cache_check_flags): Likewise.
+	* sysdeps/unix/sysv/linux/arm/readelflib.c (process_elf_file):
+	Set FLAG_ARM_LIBSF for soft-float ABI otherwise just FLAG_ELF_LIBC6.
+
 2012-12-04  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/dl-cache.h: New file.

Modified: fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h (original)
+++ fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h Thu May 23 00:03:22 2013
@@ -1,5 +1,5 @@
 /* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 2003-2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,12 +18,17 @@
 
 #include <ldconfig.h>
 
+/* In order to support the transition from unmarked objects
+   to marked objects we must treat unmarked objects as
+   compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF.  */
 #ifdef __ARM_PCS_VFP
 # define _dl_cache_check_flags(flags) \
-  ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6))
+  ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6) \
+   || (flags) == FLAG_ELF_LIBC6)
 #else
 # define _dl_cache_check_flags(flags) \
-  ((flags) == FLAG_ELF_LIBC6)
+  ((flags) == (FLAG_ARM_LIBSF | FLAG_ELF_LIBC6) \
+   || (flags) == FLAG_ELF_LIBC6)
 #endif
 
 #include_next <dl-cache.h>

Modified: fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c (original)
+++ fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/arm/readelflib.c Thu May 23 00:03:22 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999 and
 		  Jakub Jelinek <jakub@xxxxxxxxxx>, 1999.
@@ -46,6 +46,12 @@
 	  if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
 	    *flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
 	  else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
+	    *flag = FLAG_ARM_LIBSF|FLAG_ELF_LIBC6;
+	  else
+	    /* We must assume the unmarked objects are compatible
+	       with all ABI variants. Such objects may have been
+	       generated in a transitional period when the ABI
+	       tags were not added to all objects.  */
 	    *flag = FLAG_ELF_LIBC6;
 	}
     }

Modified: fsf/glibc-2_17-branch/libc/sysdeps/generic/ldconfig.h
==============================================================================
--- fsf/glibc-2_17-branch/libc/sysdeps/generic/ldconfig.h (original)
+++ fsf/glibc-2_17-branch/libc/sysdeps/generic/ldconfig.h Thu May 23 00:03:22 2013
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@xxxxxxx>, 1999.
 
@@ -36,6 +36,7 @@
 #define FLAG_X8664_LIBX32	0x0800
 #define FLAG_ARM_LIBHF		0x0900
 #define FLAG_AARCH64_LIB64	0x0a00
+#define FLAG_ARM_LIBSF		0x0b00
 
 /* Name of auxiliary cache.  */
 #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits

Prev by Date: [Commits] r23127 - in /fsf/trunk/libc: ./ benchtests/ intl/ math/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/fpu/ ports/sysdeps...
Next by Date: [Commits] r23134 - in /fsf/trunk/libc: ./ elf/ manual/ ports/ ports/sysdeps/aarch64/ sysdeps/powerpc/sys/platform/
Previous by thread: [Commits] r23127 - in /fsf/trunk/libc: ./ benchtests/ intl/ math/ ports/ ports/sysdeps/aarch64/ ports/sysdeps/alpha/fpu/ ports/sysdeps...
Next by thread: [Commits] r23134 - in /fsf/trunk/libc: ./ elf/ manual/ ports/ ports/sysdeps/aarch64/ sysdeps/powerpc/sys/platform/
Index(es):
- Date
- Thread