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

[Commits] r18732 - in /branches/eglibc-2_15: ./ libc/ libc/scripts/ libc/sysdeps/i386/i686/multiarch/ libc/sysdeps/x86_64/fpu/multiarc...



Author: joseph
Date: Sat May 26 17:49:21 2012
New Revision: 18732

Log:
Merge changes between r18363 and r18731 from /fsf/glibc-2_15-branch.

Added:
    branches/eglibc-2_15/libc/sysdeps/i386/i686/multiarch/test-multiarch.c
      - copied unchanged from r18731, fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/test-multiarch.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/test-multiarch.c
      - copied unchanged from r18731, fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/test-multiarch.c
    branches/eglibc-2_15/ports/sysdeps/tile/math_private.h
      - copied unchanged from r18731, fsf/glibc-2_15-branch/ports/sysdeps/tile/math_private.h
    branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/generic/not-cancel.h
      - copied unchanged from r18731, fsf/glibc-2_15-branch/ports/sysdeps/unix/sysv/linux/generic/not-cancel.h
Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/NEWS
    branches/eglibc-2_15/libc/scripts/firstversions.awk
    branches/eglibc-2_15/libc/sysdeps/i386/i686/multiarch/Makefile
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/Makefile
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.c
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/init-arch.h
    branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/strcmp.S
    branches/eglibc-2_15/ports/ChangeLog.linux-generic
    branches/eglibc-2_15/ports/ChangeLog.tile
    branches/eglibc-2_15/ports/sysdeps/tile/sysdep.h
    branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/generic/epoll_wait.c

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 17:49:21 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-18363
+/fsf/glibc-2_15-branch:16509-18731
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Sat May 26 17:49:21 2012
@@ -1,3 +1,33 @@
+2012-05-17  Andreas Jaeger  <aj@xxxxxxx>
+	    Carlos O'Donell  <carlos_odonell@xxxxxxxxxx>
+
+	[BZ #14059]
+	* sysdeps/x86_64/multiarch/init-arch.h
+	(bit_YMM_Usable): Rename to...
+	(bit_AVX_Usable): ... this.
+	(bit_FMA4_Usable): New macro.
+	(bit_XMM_state): New macro.
+	(bit_YMM_state): New macro.
+	[__ASSEMBLER__] (index_YMM_Usable): Rename to...
+	[__ASSEMBLER__] (index_AVX_Usable): ... this.
+	[__ASSEMBLER__] (index_FMA4_Usable): New macro.
+	(CPUID_OSXSAVE): New macro.
+	(CPUID_AVX): New macro.
+	(CPUID_FMA4): New macro.
+	(index_YMM_Usable): Rename to...
+	(index_AVX_Usable): ... this.
+	(HAS_AVX): Use HAS_ARCH_FEATURE.
+	(HAS_FMA4): Likewise.
+	(HAS_YMM_USABLE): Remove.
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+	Enable AVX or FMA4 IFF YMM and XMM states are usable and the features
+	are present.
+	* sysdeps/x86_64/multiarch/strcmp.S: Use bit_AVX_Usable.
+	* sysdeps/i386/i686/multiarch/Makefile: Add test-multiarch to tests.
+	* sysdeps/x86_64/multiarch/Makefile: Likewise.
+	* sysdeps/i386/i686/multiarch/test-multiarch.c: New file.
+	* sysdeps/x86_64/multiarch/test-multiarch.c: New file.
+
 2012-02-27  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/ieee754/ldbl-128/s_nearbyintl.c (__nearbyintl): Do not
@@ -100,6 +130,26 @@
 
 	* sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept
 	instead of feraiseexcept.
+
+2012-01-28  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* scripts/firstversions.awk: Fix bug in version range handling.
+
+2012-01-26  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #13583]
+	* sysdeps/x86_64/multiarch/init-arch.h: Define bit_OSXSAVE.
+	Clean up HAS_* macros.
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): If
+	bit_AVX is set also check OSXAVE/XCR0 and set bit_YMM_Usable if
+	possible.
+	* sysdeps/x86_64/fpu/multiarch/e_atan2.c: Use HAS_YMM_USABLE, not
+	HAS_AVX.
+	* sysdeps/x86_64/fpu/multiarch/e_exp.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/e_log.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/s_atan.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/s_sin.c: Likewise.
+	* sysdeps/x86_64/fpu/multiarch/s_tan.c: Likewise.
 
 2012-01-01  Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: branches/eglibc-2_15/libc/NEWS
==============================================================================
--- branches/eglibc-2_15/libc/NEWS (original)
+++ branches/eglibc-2_15/libc/NEWS Sat May 26 17:49:21 2012
@@ -1,5 +1,5 @@
 GNU C Library NEWS -- history of user-visible changes.  2011-12-23
-Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 1992-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
@@ -9,7 +9,8 @@
 
 * The following bugs are resolved with this release:
 
-  411, 2547, 2548, 11365, 11494, 13731, 13732, 13733, 13747, 13748, 13749
+  411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
+  13749, 13753, 13771, 13774, 14059
 
 Version 2.15
 

Modified: branches/eglibc-2_15/libc/scripts/firstversions.awk
==============================================================================
--- branches/eglibc-2_15/libc/scripts/firstversions.awk (original)
+++ branches/eglibc-2_15/libc/scripts/firstversions.awk Sat May 26 17:49:21 2012
@@ -54,9 +54,13 @@
     while (vers_compare($1, v) >= 0) {
       delete firstversion[thislib, idx[thislib]];
       idx[thislib]++;
-      if ((thislib, idx[thislib]) in firstversion)
+      if ((thislib, idx[thislib]) in firstversion) {
+        # If we're skipping a referenced version to jump ahead to a
+        # later version, synthesize the earlier referenced version now.
+        if (v != $1 && (thislib, v) in usedversion)
+          print "  " v;
         v = firstversion[thislib, idx[thislib]];
-      else
+      } else
         break;
     }
     if ($1 == v || $1 == f)

Modified: branches/eglibc-2_15/libc/sysdeps/i386/i686/multiarch/Makefile
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/i386/i686/multiarch/Makefile (original)
+++ branches/eglibc-2_15/libc/sysdeps/i386/i686/multiarch/Makefile Sat May 26 17:49:21 2012
@@ -1,5 +1,6 @@
 ifeq ($(subdir),csu)
 aux += init-arch
+tests += test-multiarch
 gen-as-const-headers += ifunc-defines.sym
 endif
 

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c Sat May 26 17:49:21 2012
@@ -14,7 +14,7 @@
 
 libm_ifunc (__ieee754_atan2,
 	    HAS_FMA4 ? __ieee754_atan2_fma4
-	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
 strong_alias (__ieee754_atan2, __atan2_finite)
 
 # define __ieee754_atan2 __ieee754_atan2_sse2

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c Sat May 26 17:49:21 2012
@@ -14,7 +14,7 @@
 
 libm_ifunc (__ieee754_exp,
 	    HAS_FMA4 ? __ieee754_exp_fma4
-	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
 strong_alias (__ieee754_exp, __exp_finite)
 
 # define __ieee754_exp __ieee754_exp_sse2

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/e_log.c Sat May 26 17:49:21 2012
@@ -14,7 +14,7 @@
 
 libm_ifunc (__ieee754_log,
 	    HAS_FMA4 ? __ieee754_log_fma4
-	    : (HAS_AVX ? __ieee754_log_avx
+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
 	       : __ieee754_log_sse2));
 strong_alias (__ieee754_log, __log_finite)
 

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c Sat May 26 17:49:21 2012
@@ -12,7 +12,8 @@
 #  define __atan_fma4 ((void *) 0)
 # endif
 
-libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
 
 # define atan __atan_sse2
 #endif

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c Sat May 26 17:49:21 2012
@@ -17,10 +17,12 @@
 #  define __sin_fma4 ((void *) 0)
 # endif
 
-libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
 weak_alias (__cos, cos)
 
-libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
 weak_alias (__sin, sin)
 
 # define __cos __cos_sse2

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c Sat May 26 17:49:21 2012
@@ -12,7 +12,8 @@
 #  define __tan_fma4 ((void *) 0)
 # endif
 
-libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
 
 # define tan __tan_sse2
 #endif

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/Makefile
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/Makefile (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/Makefile Sat May 26 17:49:21 2012
@@ -1,5 +1,6 @@
 ifeq ($(subdir),csu)
 aux += init-arch
+tests += test-multiarch
 gen-as-const-headers += ifunc-defines.sym
 endif
 

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 Sat May 26 17:49:21 2012
@@ -1,6 +1,6 @@
 /* Initialize CPU feature data.
    This file is part of the GNU C Library.
-   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -144,6 +144,25 @@
   else
     kind = arch_kind_other;
 
+  /* Can we call xgetbv?  */
+  if (CPUID_OSXSAVE)
+    {
+      unsigned int xcrlow;
+      unsigned int xcrhigh;
+      asm ("xgetbv" : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
+      /* Is YMM and XMM state usable?  */
+      if ((xcrlow & (bit_YMM_state | bit_XMM_state)) ==
+	  (bit_YMM_state | bit_XMM_state))
+	{
+	  /* Determine if AVX is usable.  */
+	  if (CPUID_AVX)
+	    __cpu_features.feature[index_AVX_Usable] |= bit_AVX_Usable;
+	  /* Determine if FMA4 is usable.  */
+	  if (CPUID_FMA4)
+	    __cpu_features.feature[index_FMA4_Usable] |= bit_FMA4_Usable;
+	}
+    }
+
   __cpu_features.family = family;
   __cpu_features.model = model;
   atomic_write_barrier ();

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 Sat May 26 17:49:21 2012
@@ -1,5 +1,5 @@
 /* This file is part of the GNU C Library.
-   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -22,15 +22,23 @@
 #define bit_Prefer_SSE_for_memop	(1 << 3)
 #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)
 
+/* CPUID Feature flags.  */
 #define bit_SSE2	(1 << 26)
 #define bit_SSSE3	(1 << 9)
 #define bit_SSE4_1	(1 << 19)
 #define bit_SSE4_2	(1 << 20)
+#define bit_OSXSAVE	(1 << 27)
 #define bit_AVX		(1 << 28)
 #define bit_POPCOUNT	(1 << 23)
 #define bit_FMA		(1 << 12)
 #define bit_FMA4	(1 << 16)
+
+/* XCR0 Feature flags.  */
+#define bit_XMM_state  (1 << 1)
+#define bit_YMM_state  (2 << 1)
 
 #ifdef	__ASSEMBLER__
 
@@ -48,6 +56,8 @@
 # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
 # 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_FMA4_Usable		FEATURE_INDEX_1*FEATURE_SIZE
 
 #else	/* __ASSEMBLER__ */
 
@@ -92,7 +102,7 @@
 
 
 extern void __init_cpu_features (void) attribute_hidden;
-#define INIT_ARCH()\
+# define INIT_ARCH() \
   do							\
     if (__cpu_features.kind == arch_kind_unknown)	\
       __init_cpu_features ();				\
@@ -111,37 +121,45 @@
 
 /* Following are the feature tests used throughout libc.  */
 
+/* CPUID_* evaluates to true if the feature flag is enabled.
+   We always use &__cpu_features because the HAS_CPUID_* macros
+   are called only within __init_cpu_features, where we can't
+   call __get_cpu_features without infinite recursion.  */
+# define HAS_CPUID_FLAG(idx, reg, bit) \
+  (((&__cpu_features)->cpuid[idx].reg & (bit)) != 0)
+
+# define CPUID_OSXSAVE \
+  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_FMA4 \
+  HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
+
+/* HAS_* evaluates to true if we may use the feature at runtime.  */
 # define HAS_SSE2	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, edx, bit_SSE2)
 # define HAS_POPCOUNT	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_POPCOUNT)
 # 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 HAS_AVX	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
-# define HAS_FMA4	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
 
 # define index_Fast_Rep_String		FEATURE_INDEX_1
 # define index_Fast_Copy_Backward	FEATURE_INDEX_1
 # define index_Slow_BSF			FEATURE_INDEX_1
 # 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_FMA4_Usable		FEATURE_INDEX_1
 
-#define HAS_ARCH_FEATURE(idx, bit) \
-  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
+# define HAS_ARCH_FEATURE(name) \
+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
 
-#define HAS_FAST_REP_STRING \
-  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-
-#define HAS_FAST_COPY_BACKWARD \
-  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-
-#define HAS_SLOW_BSF \
-  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-
-#define HAS_PREFER_SSE_FOR_MEMOP \
-  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-
-#define HAS_FAST_UNALIGNED_LOAD \
-  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
+# define HAS_FAST_REP_STRING		HAS_ARCH_FEATURE (Fast_Rep_String)
+# define HAS_FAST_COPY_BACKWARD		HAS_ARCH_FEATURE (Fast_Copy_Backward)
+# define HAS_SLOW_BSF			HAS_ARCH_FEATURE (Slow_BSF)
+# 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_FMA4			HAS_ARCH_FEATURE (FMA4_Usable)
 
 #endif	/* __ASSEMBLER__ */

Modified: branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/strcmp.S
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/strcmp.S (original)
+++ branches/eglibc-2_15/libc/sysdeps/x86_64/multiarch/strcmp.S Sat May 26 17:49:21 2012
@@ -1,5 +1,5 @@
 /* strcmp with SSE4.2
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -84,6 +84,7 @@
 	.text
 ENTRY(STRCMP)
 	.type	STRCMP, @gnu_indirect_function
+	/* Manually inlined call to __get_cpu_features.  */
 	cmpl	$0, __cpu_features+KIND_OFFSET(%rip)
 	jne	1f
 	call	__init_cpu_features
@@ -101,13 +102,14 @@
 # ifdef USE_AS_STRCASECMP_L
 ENTRY(__strcasecmp)
 	.type	__strcasecmp, @gnu_indirect_function
+	/* Manually inlined call to __get_cpu_features.  */
 	cmpl	$0, __cpu_features+KIND_OFFSET(%rip)
 	jne	1f
 	call	__init_cpu_features
 1:
 #  ifdef HAVE_AVX_SUPPORT
 	leaq	__strcasecmp_avx(%rip), %rax
-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+	testl	$bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip)
 	jnz	2f
 #  endif
 	leaq	__strcasecmp_sse42(%rip), %rax
@@ -124,13 +126,14 @@
 # ifdef USE_AS_STRNCASECMP_L
 ENTRY(__strncasecmp)
 	.type	__strncasecmp, @gnu_indirect_function
+	/* Manually inlined call to __get_cpu_features.  */
 	cmpl	$0, __cpu_features+KIND_OFFSET(%rip)
 	jne	1f
 	call	__init_cpu_features
 1:
 #  ifdef HAVE_AVX_SUPPORT
 	leaq	__strncasecmp_avx(%rip), %rax
-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+	testl	$bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip)
 	jnz	2f
 #  endif
 	leaq	__strncasecmp_sse42(%rip), %rax

Modified: branches/eglibc-2_15/ports/ChangeLog.linux-generic
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.linux-generic (original)
+++ branches/eglibc-2_15/ports/ChangeLog.linux-generic Sat May 26 17:49:21 2012
@@ -1,3 +1,12 @@
+2012-01-30  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/generic/not-cancel.h: New file.
+
+2012-01-30  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove
+	libc_hidden_proto declaration now it's in sys/epoll.h override.
+
 2011-12-09  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/generic/bits/msq.h: New file.

Modified: branches/eglibc-2_15/ports/ChangeLog.tile
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.tile (original)
+++ branches/eglibc-2_15/ports/ChangeLog.tile Sat May 26 17:49:21 2012
@@ -1,3 +1,12 @@
+2012-01-31  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/tile/math_private.h: Ignore feraiseexcept() internally.
+
+2012-01-30  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/tile/sysdep.h: Use <feedback.h> not <feedback-asm.h>
+	to reflect change from gcc community giveback.
+
 2011-12-03  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* data/c++-types-tile-linux-gnu.data: New file.

Modified: branches/eglibc-2_15/ports/sysdeps/tile/sysdep.h
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/tile/sysdep.h (original)
+++ branches/eglibc-2_15/ports/sysdeps/tile/sysdep.h Sat May 26 17:49:21 2012
@@ -31,7 +31,7 @@
 
 #if defined __ASSEMBLER__ || defined REQUEST_ASSEMBLER_MACROS
 
-#include <feedback-asm.h>
+#include <feedback.h>
 
 /* Make use of .type and .size directives.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;

Modified: branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/generic/epoll_wait.c
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/generic/epoll_wait.c (original)
+++ branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/generic/epoll_wait.c Sat May 26 17:49:21 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
 
@@ -22,8 +22,6 @@
 #include <sys/types.h>
 #include <sys/epoll.h>
 
-libc_hidden_proto (epoll_pwait)
-
 int
 epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
 {

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