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

[Commits] r21111 - in /branches/eglibc-2_15: ./ libc/ libc/posix/ libc/sysdeps/x86_64/multiarch/

To: commits@xxxxxxxxxx
Subject: [Commits] r21111 - in /branches/eglibc-2_15: ./ libc/ libc/posix/ libc/sysdeps/x86_64/multiarch/
From: joseph@xxxxxxxxxx
Date: Wed, 10 Oct 2012 15:39:42 -0000

Author: joseph
Date: Wed Oct 10 15:39:42 2012
New Revision: 21111

Log:
Merge changes between r20865 and r21110 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/NEWS
    branches/eglibc-2_15/libc/posix/glob.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.h

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 15:39:42 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-20865
+/fsf/glibc-2_15-branch:16509-21110
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Wed Oct 10 15:39:42 2012
@@ -1,3 +1,23 @@
+2012-10-04  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #14648]
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+	Set bit_FMA_Usable if FMA is supported.
+	* sysdeps/x86_64/multiarch/init-arch.h (bit_FMA_Usable): New
+	macro.
+	(bit_FMA4_Usable): Updated.
+	(index_FMA_Usable): New macro.
+	(CPUID_FMA): Likewise
+	(HAS_FMA): Defined with bit_FMA_Usable.
+
+2012-09-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14621]
+	* posix/glob.c (next_brace_sub): Use size_t instead of unsigned
+	int as type of variable DEPTH.
+	(glob): Use size_t instead of int as type of variables NEWCOUNT
+	and OLD_PATHC.
+
 2012-08-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #14459]

Modified: branches/eglibc-2_15/libc/NEWS
==============================================================================
--- branches/eglibc-2_15/libc/NEWS (original)
+++ branches/eglibc-2_15/libc/NEWS Wed Oct 10 15:39:42 2012
@@ -10,7 +10,8 @@
 * The following bugs are resolved with this release:
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
-  13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459
+  13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
+  14621, 14648
 
 Version 2.15
 

Modified: branches/eglibc-2_15/libc/posix/glob.c
==============================================================================
--- branches/eglibc-2_15/libc/posix/glob.c (original)
+++ branches/eglibc-2_15/libc/posix/glob.c Wed Oct 10 15:39:42 2012
@@ -221,7 +221,7 @@
 static const char *
 next_brace_sub (const char *cp, int flags)
 {
-  unsigned int depth = 0;
+  size_t depth = 0;
   while (*cp != '\0')
     if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
       {
@@ -966,7 +966,7 @@
 		  && S_ISDIR (st.st_mode))
 	       : (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode)))))
 	{
-	  int newcount = pglob->gl_pathc + pglob->gl_offs;
+	  size_t newcount = pglob->gl_pathc + pglob->gl_offs;
 	  char **new_gl_pathv;
 
 	  if (newcount > UINTPTR_MAX - (1 + 1)
@@ -1065,7 +1065,7 @@
 	 appending the results to PGLOB.  */
       for (i = 0; i < dirs.gl_pathc; ++i)
 	{
-	  int old_pathc;
+	  size_t old_pathc;
 
 #ifdef	SHELL
 	  {
@@ -1120,7 +1120,7 @@
 	  /* No matches.  */
 	  if (flags & GLOB_NOCHECK)
 	    {
-	      int newcount = pglob->gl_pathc + pglob->gl_offs;
+	      size_t newcount = pglob->gl_pathc + pglob->gl_offs;
 	      char **new_gl_pathv;
 
 	      if (newcount > UINTPTR_MAX - 2
@@ -1164,7 +1164,7 @@
     }
   else
     {
-      int old_pathc = pglob->gl_pathc;
+      size_t old_pathc = pglob->gl_pathc;
       int orig_flags = flags;
 
       if (meta & 2)

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.c Wed Oct 10 15:39:42 2012
@@ -157,6 +157,9 @@
 	  /* Determine if AVX is usable.  */
 	  if (CPUID_AVX)
 	    __cpu_features.feature[index_AVX_Usable] |= bit_AVX_Usable;
+	  /* Determine if FMA is usable.  */
+	  if (CPUID_FMA)
+	    __cpu_features.feature[index_FMA_Usable] |= bit_FMA_Usable;
 	  /* Determine if FMA4 is usable.  */
 	  if (CPUID_FMA4)
 	    __cpu_features.feature[index_FMA4_Usable] |= bit_FMA4_Usable;

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.h
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.h (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.h Wed Oct 10 15:39:42 2012
@@ -23,7 +23,8 @@
 #define bit_Fast_Unaligned_Load		(1 << 4)
 #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
 #define bit_AVX_Usable			(1 << 6)
-#define bit_FMA4_Usable			(1 << 7)
+#define bit_FMA_Usable			(1 << 7)
+#define bit_FMA4_Usable			(1 << 8)
 
 /* CPUID Feature flags.  */
 #define bit_SSE2	(1 << 26)
@@ -57,6 +58,7 @@
 # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
 # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
 # define index_AVX_Usable		FEATURE_INDEX_1*FEATURE_SIZE
+# define index_FMA_Usable		FEATURE_INDEX_1*FEATURE_SIZE
 # define index_FMA4_Usable		FEATURE_INDEX_1*FEATURE_SIZE
 
 #else	/* __ASSEMBLER__ */
@@ -132,6 +134,8 @@
   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_OSXSAVE)
 # define CPUID_AVX \
   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
+# define CPUID_FMA \
+  HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
 # define CPUID_FMA4 \
   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
 
@@ -141,7 +145,6 @@
 # define HAS_SSSE3	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSSE3)
 # define HAS_SSE4_1	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_1)
 # define HAS_SSE4_2	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_2)
-# define HAS_FMA	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
 
 # define index_Fast_Rep_String		FEATURE_INDEX_1
 # define index_Fast_Copy_Backward	FEATURE_INDEX_1
@@ -149,6 +152,7 @@
 # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
 # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
 # define index_AVX_Usable		FEATURE_INDEX_1
+# define index_FMA_Usable		FEATURE_INDEX_1
 # define index_FMA4_Usable		FEATURE_INDEX_1
 
 # define HAS_ARCH_FEATURE(name) \
@@ -160,6 +164,7 @@
 # define HAS_PREFER_SSE_FOR_MEMOP	HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
 # define HAS_FAST_UNALIGNED_LOAD	HAS_ARCH_FEATURE (Fast_Unaligned_Load)
 # define HAS_AVX			HAS_ARCH_FEATURE (AVX_Usable)
+# define HAS_FMA			HAS_ARCH_FEATURE (FMA_Usable)
 # define HAS_FMA4			HAS_ARCH_FEATURE (FMA4_Usable)
 
 #endif	/* __ASSEMBLER__ */

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

Prev by Date: [Commits] r21110 - in /branches/eglibc-2_16: ./ libc/ libc/malloc/ libc/posix/ libc/stdio-common/ libc/sysdeps/x86_64/multiarch/ ports...
Next by Date: [Commits] r21112 - in /trunk/libc: ChangeLog.eglibc elf/Makefile elf/tst-rtld-load-self.sh
Previous by thread: [Commits] r21110 - in /branches/eglibc-2_16: ./ libc/ libc/malloc/ libc/posix/ libc/stdio-common/ libc/sysdeps/x86_64/multiarch/ ports...
Next by thread: [Commits] r21112 - in /trunk/libc: ChangeLog.eglibc elf/Makefile elf/tst-rtld-load-self.sh
Index(es):
- Date
- Thread