[Commits] r20312 - in /fsf/trunk/libc: ./ elf/ ports/ ports/sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Aug 24 00:01:50 2012
New Revision: 20312

Log:
Import glibc-mainline for 2012-08-24

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/elf.h
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-fxstatat64.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Aug 24 00:01:50 2012
@@ -1,3 +1,13 @@
+2012-08-23  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
+
+	* elf/elf.h (EF_ARM_ABI_FLOAT_SOFT): New macro.
+	(EF_ARM_ABI_FLOAT_HARD): Likewise.
+
+2012-08-23  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/dl-fxstatat64.c: Use <> instead of "" in
+	#include of fxstatat64.c.
+
 2012-08-22  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* shadow/getspent.c: #undef USE_NSCD before #include that gets the code.

Modified: fsf/trunk/libc/elf/elf.h
==============================================================================
--- fsf/trunk/libc/elf/elf.h (original)
+++ fsf/trunk/libc/elf/elf.h Fri Aug 24 00:01:50 2012
@@ -2250,6 +2250,9 @@
 #define EF_ARM_VFP_FLOAT	0x400
 #define EF_ARM_MAVERICK_FLOAT	0x800
 
+#define EF_ARM_ABI_FLOAT_SOFT	0x200   /* NB conflicts with EF_ARM_SOFT_FLOAT */
+#define EF_ARM_ABI_FLOAT_HARD	0x400   /* NB conflicts with EF_ARM_VFP_FLOAT */
+
 
 /* Other constants defined in the ARM ELF spec. version B-01.  */
 /* NB. These conflict with values defined above.  */

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Fri Aug 24 00:01:50 2012
@@ -1,3 +1,9 @@
+2012-08-23  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/ldsodefs.h (VALID_FLOAT_ABI): Define
+	depending on __ARM_PCS_VFP.
+	(VALID_ELF_HEADER): Also check VALID_FLOAT_ABI.
+
 2012-08-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/kernel-features.h

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h Fri Aug 24 00:01:50 2012
@@ -27,10 +27,22 @@
 
 #define EXTRA_OSABI ELFOSABI_ARM_AEABI
 
+#ifdef __ARM_PCS_VFP
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)	\
+   || !((x) & EF_ARM_ABI_FLOAT_SOFT))
+#else
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)	\
+   || !((x) & EF_ARM_ABI_FLOAT_HARD))
+#endif
+
+#undef VALID_ELF_HEADER
 #define VALID_ELF_HEADER(hdr,exp,size)		\
-  (memcmp (hdr, exp, size) == 0			\
-   || memcmp (hdr, expected2, size) == 0	\
-   || memcmp (hdr, expected3, size) == 0)
+  ((memcmp (hdr, exp, size) == 0		\
+    || memcmp (hdr, expected2, size) == 0	\
+    || memcmp (hdr, expected3, size) == 0)	\
+   && VALID_FLOAT_ABI (ehdr->e_flags))
 #define VALID_ELF_OSABI(osabi)		(osabi == ELFOSABI_SYSV		\
 					 || osabi == EXTRA_OSABI	\
 					 || osabi == ELFOSABI_LINUX)

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-fxstatat64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-fxstatat64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-fxstatat64.c Fri Aug 24 00:01:50 2012
@@ -3,4 +3,4 @@
    function in this case.  */
 #undef __ASSUME_ATFCTS
 #define __ASSUME_ATFCTS 1
-#include "fxstatat64.c"
+#include <fxstatat64.c>

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