From 4bbe4e2185c5484328182720ff7b3bb4f9593bff Mon Sep 17 00:00:00 2001
From: joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>
Date: Tue, 25 Oct 2011 00:37:10 +0000
Subject: Merge changes between r15223 and r15532 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
---
 libc/config.h.in | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'libc/config.h.in')

diff --git a/libc/config.h.in b/libc/config.h.in
index 8fa682177..198e7db38 100644
--- a/libc/config.h.in
+++ b/libc/config.h.in
@@ -74,10 +74,6 @@
 /* Define if _Unwind_Find_FDE should be exported from glibc.  */
 #undef  EXPORT_UNWIND_FIND_FDE
 
-/* Define to use GNU libio instead of GNU stdio.
-   This is defined by configure under --enable-libio.  */
-#undef	USE_IN_LIBIO
-
 /* Define if using ELF and the assembler supports the `.previous'
    directive.  */
 #undef	HAVE_ASM_PREVIOUS_DIRECTIVE
@@ -95,22 +91,9 @@
 /* Define if static NSS modules are wanted.  */
 #undef	DO_STATIC_NSS
 
-/* Define if the compiler supports __builtin_expect.  */
-#undef	HAVE_BUILTIN_EXPECT
-
 /* Define if the compiler supports __builtin_memset.  */
 #undef	HAVE_BUILTIN_MEMSET
 
-/* Define if __asm () on built-in function's prototype causes redirection of
-   the builtin.  */
-#undef	HAVE_BUILTIN_REDIRECTION
-
-/* Define if the __thread keyword is supported.  */
-#undef HAVE___THREAD
-
-/* Define if the compiler supports __attribute__((tls_model(""))).  */
-#undef HAVE_TLS_MODEL_ATTRIBUTE
-
 /* Define if the regparm attribute shall be used for local functions
    (gcc on ix86 only).  */
 #undef	USE_REGPARMS
@@ -129,15 +112,15 @@
 /* Define if _rtld_local structure should be forced into .sdata section.  */
 #undef	HAVE_SDATA_SECTION
 
-/* Define if binutils support TLS handling.  */
-#undef	HAVE_TLS_SUPPORT
-
 /* Define if gcc supports SSE4.  */
 #undef	HAVE_SSE4_SUPPORT
 
 /* Define if gcc supports AVX.  */
 #undef	HAVE_AVX_SUPPORT
 
+/* Define if gcc supports FMA4.  */
+#undef	HAVE_FMA4_SUPPORT
+
 /* Define if the compiler's exception support is based on libunwind.  */
 #undef	HAVE_CC_WITH_LIBUNWIND
 
-- 
cgit v1.2.3