Cleanup of configuration options

Make several tool features mandatory and simplify the code.
author: Ulrich Drepper <drepper@gmail.com> 2011-09-10 14:34:15 -0400
committer: Ulrich Drepper <drepper@gmail.com> 2011-09-10 14:34:15 -0400
commit: 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch)
tree: db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4
parent: 1248c1c41508387ff282b208636737e8cdc9b5b0 (diff)
download: glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz
84 files changed, 467 insertions, 796 deletions
diff --git a/ChangeLog b/ChangeLog
index 663765f6be..4654e17985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,83 @@
+2011-09-10  Ulrich Drepper  <drepper@gmail.com>
+
+	* configure.in: Remove --with-__thread option.  Make tests for
+	--no-whole-archive, __builtin_expect, symbol redirection, __thread,
+	tls_model attribute fail if no support is available.  Remove
+	USE_IN_LIBIO.
+	* Makeconfig: Adjust for dropped configure option.  All features are
+	now mandatory.
+	* Makerules: Likewise.
+	* Versions.def: Likewise.
+	* argp/argp-fmtstream.c: Likewise.
+	* argp/argp-fmtstream.h: Likewise.
+	* argp/argp-help.c: Likewise.
+	* assert/assert.c: Likewise.
+	* config.h.in: Likewise.
+	* config.make.in: Likewise.
+	* configure: Likewise.
+	* configure.in: Likewise.
+	* csu/Versions: Likewise.
+	* csu/init.c: Likewise.
+	* elf/tst-audit2.c: Likewise.
+	* elf/tst-tls10.c: Likewise.
+	* elf/tst-tls10.h: Likewise.
+	* elf/tst-tls11.c: Likewise.
+	* elf/tst-tls12.c: Likewise.
+	* elf/tst-tls14.c: Likewise.
+	* elf/tst-tlsmod11.c: Likewise.
+	* elf/tst-tlsmod12.c: Likewise.
+	* elf/tst-tlsmod13.c: Likewise.
+	* elf/tst-tlsmod13a.c: Likewise.
+	* elf/tst-tlsmod14a.c: Likewise.
+	* elf/tst-tlsmod15b.c: Likewise.
+	* elf/tst-tlsmod16a.c: Likewise.
+	* elf/tst-tlsmod16b.c: Likewise.
+	* elf/tst-tlsmod7.c: Likewise.
+	* elf/tst-tlsmod8.c: Likewise.
+	* elf/tst-tlsmod9.c: Likewise.
+	* gmon/gmon.c: Likewise.
+	* grp/fgetgrent_r.c: Likewise.
+	* grp/putgrent.c: Likewise.
+	* hurd/fopenport.c: Likewise.
+	* include/libc-symbols.h: Likewise.
+	* include/tls.h: Likewise.
+	* intl/gettextP.h: Likewise.
+	* intl/loadinfo.h: Likewise.
+	* locale/global-locale.c: Likewise.
+	* locale/localeinfo.h: Likewise.
+	* mach/devstream.c: Likewise.
+	* malloc/arena.c: Likewise.
+	* malloc/set-freeres.c: Likewise.
+	* misc/err.c: Likewise.
+	* misc/getttyent.c: Likewise.
+	* misc/mntent_r.c: Likewise.
+	* posix/getopt.c: Likewise.
+	* posix/wordexp.c: Likewise.
+	* pwd/fgetpwent_r.c: Likewise.
+	* resolv/Versions: Likewise.
+	* resolv/res_hconf.c: Likewise.
+	* shadow/fgetspent_r.c: Likewise.
+	* shadow/putspent.c: Likewise.
+	* stdio-common/printf_fphex.c: Likewise.
+	* stdio-common/tmpfile.c: Likewise.
+	* stdlib/abort.c: Likewise.
+	* stdlib/fmtmsg.c: Likewise.
+	* sunrpc/auth_unix.c: Likewise.
+	* sunrpc/clnt_perr.c: Likewise.
+	* sunrpc/clnt_tcp.c: Likewise.
+	* sunrpc/clnt_udp.c: Likewise.
+	* sunrpc/clnt_unix.c: Likewise.
+	* sunrpc/openchild.c: Likewise.
+	* sunrpc/svc_simple.c: Likewise.
+	* sunrpc/svc_tcp.c: Likewise.
+	* sunrpc/svc_udp.c: Likewise.
+	* sunrpc/svc_unix.c: Likewise.
+	* sunrpc/xdr.c: Likewise.
+	* sunrpc/xdr_array.c: Likewise.
+	* sunrpc/xdr_rec.c: Likewise.
+	* sunrpc/xdr_ref.c: Likewise.
+	* sunrpc/xdr_stdio.c: Likewise.
+
 2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Adjust ULPs for jn tests.
diff --git a/Makeconfig b/Makeconfig
index feca6038ce..96aacda449 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -407,6 +407,10 @@ as-needed :=
 no-as-needed :=
 endif
 
+# Must be supported by the linker.
+no-whole-archive = -Wl,--no-whole-archive
+whole-archive = -Wl,--whole-archive
+
 # Installed name of the startup code.
 ifneq ($(have-initfini),yes)
 # When not having init/fini, there is just one startfile, called crt0.o.
diff --git a/Makerules b/Makerules
index 03e08ef17b..c75927b669 100644
--- a/Makerules
+++ b/Makerules
@@ -595,7 +595,6 @@ endif
 build-module-helper-objlist = \
 	$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\
 		   $(filter-out %.lds $(map-file) $(+preinit) $(+postinit),$^))
-whole-archive := -Wl,--whole-archive
 
 build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)
 build-shlib-objlist = $(build-module-helper-objlist) \
@@ -621,7 +620,7 @@ endif
 ifeq ($(elf),yes)
 $(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a
 	$(LINK.o) -nostdlib -nostartfiles -r -o $@ \
-	$(LDFLAGS-c_pic.os) -Wl,-d -Wl,--whole-archive $^ -o $@
+	$(LDFLAGS-c_pic.os) -Wl,-d $(whole-archive) $^ -o $@
 
 ifeq (,$(strip $(shlib-lds-flags)))
 # Generate a list of -R options to excise .gnu.glibc-stub.* sections.
diff --git a/Versions.def b/Versions.def
index 98c28001ac..4aa379f247 100644
--- a/Versions.def
+++ b/Versions.def
@@ -32,9 +32,7 @@ libc {
   GLIBC_2.13
   GLIBC_2.14
   GLIBC_2.15
-%ifdef USE_IN_LIBIO
   HURD_CTHREADS_0.3
-%endif
 %ifdef EXPORT_UNWIND_FIND_FDE
   GCC_3.0
 %endif
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index 55ac7f9183..f57b99d1d8 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -1,5 +1,5 @@
 /* Word-wrapping and line-truncating streams
-   Copyright (C) 1997-1999,2001,2002,2003,2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999,2001-2003,2005,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -40,7 +40,7 @@
 #define isblank(ch) ((ch)==' ' || (ch)=='\t')
 #endif
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#ifdef _LIBC
 # include <wchar.h>
 # include <libio/libioP.h>
 # define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
@@ -101,11 +101,7 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
   __argp_fmtstream_update (fs);
   if (fs->p > fs->buf)
     {
-#ifdef USE_IN_LIBIO
       __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
-#else
-      fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
-#endif
     }
   free (fs->buf);
   free (fs);
@@ -150,11 +146,9 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 	      size_t i;
 	      for (i = 0; i < pad; i++)
 		{
-#ifdef USE_IN_LIBIO
 		  if (_IO_fwide (fs->stream, 0) > 0)
 		    putwc_unlocked (L' ', fs->stream);
 		  else
-#endif
 		    putc_unlocked (' ', fs->stream);
 		}
 	    }
@@ -315,11 +309,9 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
 	      *nl++ = ' ';
 	  else
 	    for (i = 0; i < fs->wmargin; ++i)
-#ifdef USE_IN_LIBIO
 	      if (_IO_fwide (fs->stream, 0) > 0)
 		putwc_unlocked (L' ', fs->stream);
 	      else
-#endif
 		putc_unlocked (' ', fs->stream);
 
 	  /* Copy the tail of the original buffer into the current buffer
diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h
index f94207a20b..aa8842132f 100644
--- a/argp/argp-fmtstream.h
+++ b/argp/argp-fmtstream.h
@@ -1,5 +1,5 @@
 /* Word-wrapping and line-truncating streams.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -43,8 +43,7 @@
 # endif
 #endif
 
-#if    (_LIBC - 0 && !defined (USE_IN_LIBIO)) \
-    || (defined (__GNU_LIBRARY__) && defined (HAVE_LINEWRAP_H))
+#if defined (__GNU_LIBRARY__) && defined (HAVE_LINEWRAP_H)
 /* line_wrap_stream is available, so use that.  */
 #define ARGP_FMTSTREAM_USE_LINEWRAP
 #endif
diff --git a/argp/argp-help.c b/argp/argp-help.c
index c12b10e235..bab5b4081e 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1,6 +1,5 @@
 /* Hierarchial argument parsing help output
-   Copyright (C) 1995-2003, 2004, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -312,13 +311,13 @@ fill_in_uparams (const struct argp_state *state)
      {"no-parent", 'P',	      0,     0, "Include processes without parents"},
      {0,           'x',       0,     OPTION_ALIAS},
      {"all-fields",'Q',       0,     0, "Don't elide unusable fields (normally"
-                                        " if there's some reason ps can't"
+					" if there's some reason ps can't"
 					" print a field for any process, it's"
-                                        " removed from the output entirely)" },
+					" removed from the output entirely)" },
      {"reverse",   'r',       0,     0, "Reverse the order of any sort"},
      {"gratuitously-long-reverse-option", 0, 0, OPTION_ALIAS},
      {"session",   OPT_SESS,  "SID", OPTION_ARG_OPTIONAL,
-                                        "Add the processes from the session"
+					"Add the processes from the session"
 					" SID (which defaults to the sid of"
 					" the current process)" },
 
@@ -1874,11 +1873,9 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
 #endif
 	    }
 
-#ifdef USE_IN_LIBIO
 	  if (_IO_fwide (stream, 0) > 0)
 	    putwc_unlocked (L'\n', stream);
 	  else
-#endif
 	    putc_unlocked ('\n', stream);
 
 #if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
diff --git a/assert/assert.c b/assert/assert.c
index 803015f0f4..40fedb72e8 100644
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -30,11 +30,9 @@
 
 extern const char *__progname;
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
+#define fflush(s) INTUSE(_IO_fflush) (s)
 
 /* This function, when passed a string containing an asserted
    expression, a filename, and a line number, prints a message
diff --git a/config.h.in b/config.h.in
index 9e797eb5b7..893d8f6be3 100644
--- a/config.h.in
+++ b/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
diff --git a/config.make.in b/config.make.in
index 8308d1d206..cca3954d73 100644
--- a/config.make.in
+++ b/config.make.in
@@ -75,7 +75,6 @@ static-libgcc = @libc_cv_gcc_static_libgcc@
 
 versioning = @VERSIONING@
 oldest-abi = @oldest_abi@
-no-whole-archive = @no_whole_archive@
 exceptions = @exceptions@
 multi-arch = @multi_arch@
 
diff --git a/configure b/configure
index 047376c469..5485a75578 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in CVSid.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU C Library (see version.h).
+# Generated by GNU Autoconf 2.66 for GNU C Library (see version.h).
 #
 # Report bugs to <glibc>.
 #
@@ -92,7 +92,6 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -218,18 +217,11 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -642,7 +634,6 @@ have_libaudit
 LIBGD
 libc_cv_cc_submachine
 exceptions
-no_whole_archive
 libc_cv_have_initfini
 gnu89_inline
 libc_cv_ssp
@@ -784,7 +775,6 @@ enable_oldest_abi
 enable_stackguard_randomization
 enable_add_ons
 with_tls
-with___thread
 enable_hidden_plt
 enable_bind_now
 enable_static_nss
@@ -870,9 +860,8 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1212,7 +1201,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1468,7 +1457,6 @@ Optional Packages:
                           /usr/src/linux/include) [default=compiler default]
   --with-default-link     do not use explicit linker scripts
   --with-tls              enable support for TLS
-  --without-__thread      do not use TLS features even when supporting them
   --with-cpu=CPU          select code for CPU variant
 
 Some influential environment variables:
@@ -1552,7 +1540,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU C Library configure (see version.h)
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.66
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1598,7 +1586,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1624,7 +1612,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1635,7 +1623,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1673,7 +1661,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1719,7 +1707,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1761,7 +1749,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1939,7 +1927,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -1953,7 +1941,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1971,7 +1959,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 cat >config.log <<_ACEOF
@@ -1979,7 +1967,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU C Library $as_me (see version.h), which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
 
@@ -2370,7 +2358,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -2404,7 +2392,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -2446,7 +2434,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2486,7 +2474,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2539,7 +2527,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2579,7 +2567,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2638,7 +2626,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2682,7 +2670,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2767,7 +2755,7 @@ done
 EXEEXT=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2818,7 +2806,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2855,7 +2843,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -2933,7 +2921,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3035,7 +3023,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_BUILD_CC+:} false; then :
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$BUILD_CC"; then
@@ -3085,7 +3073,7 @@ if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3115,7 +3103,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3131,11 +3119,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3174,7 +3162,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3190,11 +3178,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
@@ -3227,7 +3215,7 @@ if test -z "$CXX"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -3271,7 +3259,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -3349,7 +3337,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3386,7 +3374,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3679,15 +3667,6 @@ else
 fi
 
 
-
-# Check whether --with-__thread was given.
-if test "${with___thread+set}" = set; then :
-  withval=$with___thread; use__thread=$withval
-else
-  use__thread=yes
-fi
-
-
 # Check whether --enable-hidden-plt was given.
 if test "${enable_hidden_plt+set}" = set; then :
   enableval=$enable_hidden_plt; hidden=$enableval
@@ -4112,7 +4091,7 @@ fi
 # For the multi-arch option we need support in the assembler.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler gnu_indirect_function symbol type support" >&5
 $as_echo_n "checking for assembler gnu_indirect_function symbol type support... " >&6; }
-if ${libc_cv_asm_gnu_indirect_function+:} false; then :
+if test "${libc_cv_asm_gnu_indirect_function+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -4131,7 +4110,7 @@ $as_echo "$libc_cv_asm_gnu_indirect_function" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether .text pseudo-op must be used" >&5
 $as_echo_n "checking whether .text pseudo-op must be used... " >&6; }
-if ${libc_cv_dot_text+:} false; then :
+if test "${libc_cv_dot_text+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -4159,7 +4138,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler global-symbol directive" >&5
 $as_echo_n "checking for assembler global-symbol directive... " >&6; }
-if ${libc_cv_asm_global_directive+:} false; then :
+if test "${libc_cv_asm_global_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   libc_cv_asm_global_directive=UNKNOWN
@@ -4194,7 +4173,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .type directive prefix" >&5
 $as_echo_n "checking for assembler .type directive prefix... " >&6; }
-if ${libc_cv_asm_type_prefix+:} false; then :
+if test "${libc_cv_asm_type_prefix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   libc_cv_asm_type_prefix=no
@@ -4567,7 +4546,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4677,7 +4656,7 @@ OBJCOPY=`$CC -print-prog-name=objcopy`
 # Determine whether we are using GNU binutils.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AS is GNU as" >&5
 $as_echo_n "checking whether $AS is GNU as... " >&6; }
-if ${libc_cv_prog_as_gnu+:} false; then :
+if test "${libc_cv_prog_as_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Most GNU programs take a -v and spit out some text including
@@ -4696,7 +4675,7 @@ gnu_as=$libc_cv_prog_as_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD is GNU ld" >&5
 $as_echo_n "checking whether $LD is GNU ld... " >&6; }
-if ${libc_cv_prog_ld_gnu+:} false; then :
+if test "${libc_cv_prog_ld_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # Most GNU programs take a -v and spit out some text including
@@ -4720,7 +4699,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -4783,7 +4762,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LD+:} false; then :
+if test "${ac_cv_prog_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LD"; then
@@ -4850,7 +4829,7 @@ fi
 set dummy pwd; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PWD_P+:} false; then :
+if test "${ac_cv_path_PWD_P+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PWD_P in
@@ -4899,7 +4878,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4962,7 +4941,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKE+:} false; then :
+if test "${ac_cv_prog_MAKE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MAKE"; then
@@ -5026,7 +5005,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MSGFMT+:} false; then :
+if test "${ac_cv_prog_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MSGFMT"; then
@@ -5089,7 +5068,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MAKEINFO+:} false; then :
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MAKEINFO"; then
@@ -5152,7 +5131,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_SED+:} false; then :
+if test "${ac_cv_prog_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$SED"; then
@@ -5215,7 +5194,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}readelf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_READELF+:} false; then :
+if test "${ac_cv_prog_READELF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$READELF"; then
@@ -5255,7 +5234,7 @@ if test -z "$ac_cv_prog_READELF"; then
 set dummy readelf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_READELF+:} false; then :
+if test "${ac_cv_prog_ac_ct_READELF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_READELF"; then
@@ -5309,7 +5288,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AUTOCONF+:} false; then :
+if test "${ac_cv_prog_AUTOCONF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AUTOCONF"; then
@@ -5351,7 +5330,7 @@ xno|x|x:) AUTOCONF=no ;;
 *)
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5
 $as_echo_n "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; }
-if ${libc_cv_autoconf_works+:} false; then :
+if test "${libc_cv_autoconf_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     if (cd $srcdir; $AUTOCONF $ACFLAGS configure.in > /dev/null 2>&1); then
@@ -5435,7 +5414,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC supports -static-libgcc" >&5
 $as_echo_n "checking whether GCC supports -static-libgcc... " >&6; }
-if ${libc_cv_gcc_static_libgcc+:} false; then :
+if test "${libc_cv_gcc_static_libgcc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if $CC -v -static-libgcc 2>&1 | grep -q 'unrecognized option.*static-libgcc'; then
@@ -5452,7 +5431,7 @@ $as_echo "$libc_cv_gcc_static_libgcc" >&6; }
 set dummy bash; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASH_SHELL+:} false; then :
+if test "${ac_cv_path_BASH_SHELL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $BASH_SHELL in
@@ -5503,7 +5482,7 @@ if test "$BASH_SHELL" = no; then
 set dummy ksh; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_KSH+:} false; then :
+if test "${ac_cv_path_KSH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $KSH in
@@ -5558,7 +5537,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -5598,7 +5577,7 @@ done
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -5643,7 +5622,7 @@ fi
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INSTALL_INFO in
@@ -5685,7 +5664,7 @@ fi
 set dummy bison; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BISON+:} false; then :
+if test "${ac_cv_path_BISON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $BISON in
@@ -5726,7 +5705,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for signed size_t type" >&5
 $as_echo_n "checking for signed size_t type... " >&6; }
-if ${libc_cv_signed_size_t+:} false; then :
+if test "${libc_cv_signed_size_t+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo '#include <stddef.h>
@@ -5750,7 +5729,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libc-friendly stddef.h" >&5
 $as_echo_n "checking for libc-friendly stddef.h... " >&6; }
-if ${libc_cv_friendly_stddef+:} false; then :
+if test "${libc_cv_friendly_stddef+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5788,7 +5767,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to use -P to assemble .S files" >&5
 $as_echo_n "checking whether we need to use -P to assemble .S files... " >&6; }
-if ${libc_cv_need_minus_P+:} false; then :
+if test "${libc_cv_need_minus_P+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.S <<EOF
@@ -5816,7 +5795,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .set assembler directive" >&5
 $as_echo_n "checking for .set assembler directive... " >&6; }
-if ${libc_cv_asm_set_directive+:} false; then :
+if test "${libc_cv_asm_set_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -5849,7 +5828,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler gnu_unique_object symbol type" >&5
 $as_echo_n "checking for assembler gnu_unique_object symbol type... " >&6; }
-if ${libc_cv_asm_unique_object+:} false; then :
+if test "${libc_cv_asm_unique_object+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -5873,7 +5852,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .symver assembler directive" >&5
 $as_echo_n "checking for .symver assembler directive... " >&6; }
-if ${libc_cv_asm_symver_directive+:} false; then :
+if test "${libc_cv_asm_symver_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -5892,7 +5871,7 @@ fi
 $as_echo "$libc_cv_asm_symver_directive" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --version-script" >&5
 $as_echo_n "checking for ld --version-script... " >&6; }
-if ${libc_cv_ld_version_script_option+:} false; then :
+if test "${libc_cv_ld_version_script_option+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test $libc_cv_asm_symver_directive = yes; then
@@ -5958,7 +5937,7 @@ fi
 if test $elf = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .previous assembler directive" >&5
 $as_echo_n "checking for .previous assembler directive... " >&6; }
-if ${libc_cv_asm_previous_directive+:} false; then :
+if test "${libc_cv_asm_previous_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.s <<EOF
@@ -5985,7 +5964,7 @@ $as_echo "$libc_cv_asm_previous_directive" >&6; }
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .popsection assembler directive" >&5
 $as_echo_n "checking for .popsection assembler directive... " >&6; }
-if ${libc_cv_asm_popsection_directive+:} false; then :
+if test "${libc_cv_asm_popsection_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       cat > conftest.s <<EOF
@@ -6013,7 +5992,7 @@ $as_echo "$libc_cv_asm_popsection_directive" >&6; }
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .protected and .hidden assembler directive" >&5
 $as_echo_n "checking for .protected and .hidden assembler directive... " >&6; }
-if ${libc_cv_asm_protected_directive+:} false; then :
+if test "${libc_cv_asm_protected_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.s <<EOF
@@ -6040,7 +6019,7 @@ $as_echo "$libc_cv_asm_protected_directive" >&6; }
   if test $libc_cv_asm_protected_directive = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((visibility())) is supported" >&5
 $as_echo_n "checking whether __attribute__((visibility())) is supported... " >&6; }
-if ${libc_cv_visibility_attribute+:} false; then :
+if test "${libc_cv_visibility_attribute+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6073,7 +6052,7 @@ $as_echo "$libc_cv_visibility_attribute" >&6; }
   if test $libc_cv_visibility_attribute = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken __attribute__((visibility()))" >&5
 $as_echo_n "checking for broken __attribute__((visibility()))... " >&6; }
-if ${libc_cv_broken_visibility_attribute+:} false; then :
+if test "${libc_cv_broken_visibility_attribute+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6104,7 +6083,7 @@ $as_echo "$libc_cv_broken_visibility_attribute" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken __attribute__((alias()))" >&5
 $as_echo_n "checking for broken __attribute__((alias()))... " >&6; }
-if ${libc_cv_broken_alias_attribute+:} false; then :
+if test "${libc_cv_broken_alias_attribute+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6139,7 +6118,7 @@ $as_echo "$libc_cv_broken_alias_attribute" >&6; }
   if test $libc_cv_visibility_attribute = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to put _rtld_local into .sdata section" >&5
 $as_echo_n "checking whether to put _rtld_local into .sdata section... " >&6; }
-if ${libc_cv_have_sdata_section+:} false; then :
+if test "${libc_cv_have_sdata_section+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   echo "int i;" > conftest.c
@@ -6161,7 +6140,7 @@ $as_echo "$libc_cv_have_sdata_section" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .preinit_array/.init_array/.fini_array support" >&5
 $as_echo_n "checking for .preinit_array/.init_array/.fini_array support... " >&6; }
-if ${libc_cv_initfini_array+:} false; then :
+if test "${libc_cv_initfini_array+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6196,7 +6175,7 @@ $as_echo "$libc_cv_initfini_array" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use .ctors/.dtors header and trailer" >&5
 $as_echo_n "checking whether to use .ctors/.dtors header and trailer... " >&6; }
-if ${libc_cv_ctors_header+:} false; then :
+if test "${libc_cv_ctors_header+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       libc_cv_ctors_header=yes
@@ -6249,7 +6228,7 @@ $as_echo "$libc_cv_ctors_header" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind-support in compiler" >&5
 $as_echo_n "checking for libunwind-support in compiler... " >&6; }
-if ${libc_cv_cc_with_libunwind+:} false; then :
+if test "${libc_cv_cc_with_libunwind+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6274,7 +6253,7 @@ $as_echo "$libc_cv_cc_with_libunwind" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z nodelete option" >&5
 $as_echo_n "checking for -z nodelete option... " >&6; }
-if ${libc_cv_z_nodelete+:} false; then :
+if test "${libc_cv_z_nodelete+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6301,7 +6280,7 @@ $as_echo "$libc_cv_z_nodelete" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z nodlopen option" >&5
 $as_echo_n "checking for -z nodlopen option... " >&6; }
-if ${libc_cv_z_nodlopen+:} false; then :
+if test "${libc_cv_z_nodlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6328,7 +6307,7 @@ $as_echo "$libc_cv_z_nodlopen" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z initfirst option" >&5
 $as_echo_n "checking for -z initfirst option... " >&6; }
-if ${libc_cv_z_initfirst+:} false; then :
+if test "${libc_cv_z_initfirst+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6377,7 +6356,7 @@ $as_echo "$libc_cv_z_initfirst" >&6; }
   if test $libc_commonpagesize != no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z relro option" >&5
 $as_echo_n "checking for -z relro option... " >&6; }
-if ${libc_cv_z_relro+:} false; then :
+if test "${libc_cv_z_relro+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       libc_cv_z_relro=no
@@ -6454,7 +6433,7 @@ $as_echo "$as_me: WARNING: missing architecture parameter to check for working -
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bgroup option" >&5
 $as_echo_n "checking for -Bgroup option... " >&6; }
-if ${libc_cv_Bgroup+:} false; then :
+if test "${libc_cv_Bgroup+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6481,7 +6460,7 @@ $as_echo "$libc_cv_Bgroup" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcc_s suffix" >&5
 $as_echo_n "checking for libgcc_s suffix... " >&6; }
-if ${libc_cv_libgcc_s_suffix+:} false; then :
+if test "${libc_cv_libgcc_s_suffix+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6499,7 +6478,7 @@ $as_echo "$libc_cv_libgcc_s_suffix" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5
 $as_echo_n "checking for --as-needed option... " >&6; }
-if ${libc_cv_as_needed+:} false; then :
+if test "${libc_cv_as_needed+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6528,7 +6507,7 @@ $as_echo "$libc_cv_as_needed" >&6; }
   ASFLAGS_config=
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --noexecstack is desirable for .S files" >&5
 $as_echo_n "checking whether --noexecstack is desirable for .S files... " >&6; }
-if ${libc_cv_as_noexecstack+:} false; then :
+if test "${libc_cv_as_noexecstack+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6565,7 +6544,7 @@ $as_echo "$libc_cv_as_noexecstack" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z combreloc" >&5
 $as_echo_n "checking for -z combreloc... " >&6; }
-if ${libc_cv_z_combreloc+:} false; then :
+if test "${libc_cv_z_combreloc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6603,7 +6582,7 @@ $as_echo "$libc_cv_z_combreloc" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z execstack" >&5
 $as_echo_n "checking for -z execstack... " >&6; }
-if ${libc_cv_z_execstack+:} false; then :
+if test "${libc_cv_z_execstack+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6631,7 +6610,7 @@ $as_echo "$libc_cv_z_execstack" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fpie" >&5
 $as_echo_n "checking for -fpie... " >&6; }
-if ${libc_cv_fpie+:} false; then :
+if test "${libc_cv_fpie+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6659,7 +6638,7 @@ $as_echo "$libc_cv_fpie" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5
 $as_echo_n "checking for --hash-style option... " >&6; }
-if ${libc_cv_hashstyle+:} false; then :
+if test "${libc_cv_hashstyle+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     cat > conftest.c <<EOF
@@ -6690,7 +6669,7 @@ $as_echo "$libc_cv_hashstyle" >&6; }
   if test "$use_default_link" = default; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sufficient default -shared layout" >&5
 $as_echo_n "checking for sufficient default -shared layout... " >&6; }
-if ${libc_cv_use_default_link+:} false; then :
+if test "${libc_cv_use_default_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       libc_cv_use_default_link=no
@@ -6750,7 +6729,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker output format" >&5
 $as_echo_n "checking linker output format... " >&6; }
-if ${libc_cv_output_format+:} false; then :
+if test "${libc_cv_output_format+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if libc_cv_output_format=`
@@ -6768,7 +6747,7 @@ $as_echo "$libc_cv_output_format" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-toplevel-reorder -fno-section-anchors" >&5
 $as_echo_n "checking for -fno-toplevel-reorder -fno-section-anchors... " >&6; }
-if ${libc_cv_fno_toplevel_reorder+:} false; then :
+if test "${libc_cv_fno_toplevel_reorder+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6799,7 +6778,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fstack-protector" >&5
 $as_echo_n "checking for -fstack-protector... " >&6; }
-if ${libc_cv_ssp+:} false; then :
+if test "${libc_cv_ssp+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6826,7 +6805,7 @@ $as_echo "$libc_cv_ssp" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline" >&5
 $as_echo_n "checking for -fgnu89-inline... " >&6; }
-if ${libc_cv_gnu89_inline+:} false; then :
+if test "${libc_cv_gnu89_inline+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6863,7 +6842,7 @@ fi
 if test $elf != yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for .init and .fini sections" >&5
 $as_echo_n "checking for .init and .fini sections... " >&6; }
-if ${libc_cv_have_initfini+:} false; then :
+if test "${libc_cv_have_initfini+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6897,7 +6876,7 @@ fi
 if test $elf = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc puts quotes around section names" >&5
 $as_echo_n "checking whether cc puts quotes around section names... " >&6; }
-if ${libc_cv_have_section_quotes+:} false; then :
+if test "${libc_cv_have_section_quotes+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -6932,7 +6911,7 @@ else
   if test $ac_cv_prog_cc_works = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix on C symbol names" >&5
 $as_echo_n "checking for _ prefix on C symbol names... " >&6; }
-if ${libc_cv_asm_underscores+:} false; then :
+if test "${libc_cv_asm_underscores+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6959,7 +6938,7 @@ $as_echo "$libc_cv_asm_underscores" >&6; }
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix on C symbol names" >&5
 $as_echo_n "checking for _ prefix on C symbol names... " >&6; }
-if ${libc_cv_asm_underscores+:} false; then :
+if test "${libc_cv_asm_underscores+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.$ac_ext <<EOF
@@ -7003,7 +6982,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .weak directive" >&5
 $as_echo_n "checking for assembler .weak directive... " >&6; }
-if ${libc_cv_asm_weak_directive+:} false; then :
+if test "${libc_cv_asm_weak_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -7031,7 +7010,7 @@ $as_echo "$libc_cv_asm_weak_directive" >&6; }
 if test $libc_cv_asm_weak_directive = no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .weakext directive" >&5
 $as_echo_n "checking for assembler .weakext directive... " >&6; }
-if ${libc_cv_asm_weakext_directive+:} false; then :
+if test "${libc_cv_asm_weakext_directive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
@@ -7070,7 +7049,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CFI directives are supported" >&5
 $as_echo_n "checking whether CFI directives are supported... " >&6; }
-if ${libc_cv_asm_cfi_directives+:} false; then :
+if test "${libc_cv_asm_cfi_directives+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $machine in
@@ -7107,7 +7086,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --no-whole-archive" >&5
 $as_echo_n "checking for ld --no-whole-archive... " >&6; }
-if ${libc_cv_ld_no_whole_archive+:} false; then :
+if test "${libc_cv_ld_no_whole_archive+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<\EOF
@@ -7131,13 +7110,13 @@ rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_no_whole_archive" >&5
 $as_echo "$libc_cv_ld_no_whole_archive" >&6; }
-if test $libc_cv_ld_no_whole_archive = yes; then
-  no_whole_archive=-Wl,--no-whole-archive
+if test $libc_cv_ld_no_whole_archive = no; then
+  as_fn_error $? "support for --no-whole-archive is needed" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc -fexceptions" >&5
 $as_echo_n "checking for gcc -fexceptions... " >&6; }
-if ${libc_cv_gcc_exceptions+:} false; then :
+if test "${libc_cv_gcc_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<\EOF
@@ -7170,7 +7149,7 @@ if test "$host_cpu" = powerpc ; then
 # and versions 1.0.x of EGCS.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether clobbering cr0 causes problems" >&5
 $as_echo_n "checking whether clobbering cr0 causes problems... " >&6; }
-if ${libc_cv_c_asmcr0_bug+:} false; then :
+if test "${libc_cv_c_asmcr0_bug+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7201,7 +7180,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
 $as_echo_n "checking for __builtin_expect... " >&6; }
-if ${libc_cv_gcc_builtin_expect+:} false; then :
+if test "${libc_cv_gcc_builtin_expect+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<EOF
@@ -7227,14 +7206,13 @@ rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_builtin_expect" >&5
 $as_echo "$libc_cv_gcc_builtin_expect" >&6; }
-if test "$libc_cv_gcc_builtin_expect" = yes; then
-  $as_echo "#define HAVE_BUILTIN_EXPECT 1" >>confdefs.h
-
+if test "$libc_cv_gcc_builtin_expect" = no; then
+  as_fn_error $? "support for __builtin_expect needed" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memset" >&5
 $as_echo_n "checking for __builtin_memset... " >&6; }
-if ${libc_cv_gcc_builtin_memset+:} false; then :
+if test "${libc_cv_gcc_builtin_memset+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<\EOF
@@ -7265,7 +7243,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redirection of built-in functions" >&5
 $as_echo_n "checking for redirection of built-in functions... " >&6; }
-if ${libc_cv_gcc_builtin_redirection+:} false; then :
+if test "${libc_cv_gcc_builtin_redirection+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<\EOF
@@ -7290,75 +7268,66 @@ rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_builtin_redirection" >&5
 $as_echo "$libc_cv_gcc_builtin_redirection" >&6; }
-if test "$libc_cv_gcc_builtin_redirection" = yes ; then
-  $as_echo "#define HAVE_BUILTIN_REDIRECTION 1" >>confdefs.h
-
+if test "$libc_cv_gcc_builtin_redirection" = no; then
+  as_fn_error $? "support for the symbol redirection needed" "$LINENO" 5
 fi
 
-if test "x$use__thread" != xno; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread" >&5
 $as_echo_n "checking for __thread... " >&6; }
-if ${libc_cv_gcc___thread+:} false; then :
+if test "${libc_cv_gcc___thread+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.c <<\EOF
 __thread int a = 42;
 EOF
-  if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c >&5'
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c >&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
-    libc_cv_gcc___thread=yes
-  else
-    libc_cv_gcc___thread=no
-  fi
-  rm -f conftest*
+  libc_cv_gcc___thread=yes
+else
+  libc_cv_gcc___thread=no
+fi
+rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc___thread" >&5
 $as_echo "$libc_cv_gcc___thread" >&6; }
-  if test "$libc_cv_gcc___thread" = yes; then
-    $as_echo "#define HAVE___THREAD 1" >>confdefs.h
-
-  fi
-else
-  libc_cv_gcc___thread=no
+if test "$libc_cv_gcc___thread" = no; then
+  as_fn_error $? "support for the __thread keyword is required" "$LINENO" 5
 fi
 
-if test "$libc_cv_gcc___thread" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tls_model attribute" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tls_model attribute" >&5
 $as_echo_n "checking for tls_model attribute... " >&6; }
-if ${libc_cv_gcc_tls_model_attr+:} false; then :
+if test "${libc_cv_gcc_tls_model_attr+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-    cat > conftest.c <<\EOF
+  cat > conftest.c <<\EOF
 extern __thread int a __attribute__((tls_model ("initial-exec")));
 EOF
-  if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S -Werror conftest.c >&5'
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S -Werror conftest.c >&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
-    libc_cv_gcc_tls_model_attr=yes
-  else
-    libc_cv_gcc_tls_model_attr=no
-  fi
-  rm -f conftest*
+  libc_cv_gcc_tls_model_attr=yes
+else
+  libc_cv_gcc_tls_model_attr=no
+fi
+rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_tls_model_attr" >&5
 $as_echo "$libc_cv_gcc_tls_model_attr" >&6; }
-  if test "$libc_cv_gcc_tls_model_attr" = yes; then
-    $as_echo "#define HAVE_TLS_MODEL_ATTRIBUTE 1" >>confdefs.h
-
-  fi
+if test "$libc_cv_gcc_tls_model_attr" = no; then
+  as_fn_error $? "support for the tls_model attribute is required" "$LINENO" 5
 fi
 
 if test -n "$submachine"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option for CPU variant" >&5
 $as_echo_n "checking for compiler option for CPU variant... " >&6; }
-if ${libc_cv_cc_submachine+:} false; then :
+if test "${libc_cv_cc_submachine+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     libc_cv_cc_submachine=no
@@ -7426,7 +7395,7 @@ else
   # See if we have the SELinux library
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
 $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then :
+if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7460,7 +7429,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
 $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
-if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then :
+if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then :
   have_selinux=yes
 else
   have_selinux=no
@@ -7510,7 +7479,7 @@ $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
   # See if we have the libaudit library
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_log_user_avc_message in -laudit" >&5
 $as_echo_n "checking for audit_log_user_avc_message in -laudit... " >&6; }
-if ${ac_cv_lib_audit_audit_log_user_avc_message+:} false; then :
+if test "${ac_cv_lib_audit_audit_log_user_avc_message+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7544,7 +7513,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_log_user_avc_message" >&5
 $as_echo "$ac_cv_lib_audit_audit_log_user_avc_message" >&6; }
-if test "x$ac_cv_lib_audit_audit_log_user_avc_message" = xyes; then :
+if test "x$ac_cv_lib_audit_audit_log_user_avc_message" = x""yes; then :
   have_libaudit=yes
 else
   have_libaudit=no
@@ -7560,7 +7529,7 @@ $as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h
   # See if we have the libcap library
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcap" >&5
 $as_echo_n "checking for cap_init in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_init+:} false; then :
+if test "${ac_cv_lib_cap_cap_init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7594,7 +7563,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_init" >&5
 $as_echo "$ac_cv_lib_cap_cap_init" >&6; }
-if test "x$ac_cv_lib_cap_cap_init" = xyes; then :
+if test "x$ac_cv_lib_cap_cap_init" = x""yes; then :
   have_libcap=yes
 else
   have_libcap=no
@@ -7612,7 +7581,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -7675,7 +7644,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -7742,7 +7711,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7875,7 +7844,7 @@ done
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
 $as_echo_n "checking size of long double... " >&6; }
-if ${ac_cv_sizeof_long_double+:} false; then :
+if test "${ac_cv_sizeof_long_double+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double"        "$ac_includes_default"; then :
@@ -7935,9 +7904,6 @@ if test x$libc_cv_gcc_unwind_find_fde = xyes; then
 fi
 
 
-$as_echo "#define USE_IN_LIBIO 1" >>confdefs.h
-
-
 # Test for old glibc 2.0.x headers so that they can be removed properly
 # Search only in includedir.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for old glibc 2.0.x headers" >&5
@@ -7991,7 +7957,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is default" >&5
 $as_echo_n "checking whether -fPIC is default... " >&6; }
-if ${libc_cv_pic_default+:} false; then :
+if test "${libc_cv_pic_default+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   libc_cv_pic_default=yes
@@ -8098,21 +8064,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -8144,7 +8099,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -8245,7 +8200,6 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8553,7 +8507,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by GNU C Library $as_me (see version.h), which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8621,7 +8575,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 GNU C Library config.status (see version.h)
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -8641,16 +8595,11 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -8672,7 +8621,6 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -8776,10 +8724,9 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -8787,13 +8734,12 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -8815,7 +8761,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -8843,7 +8789,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -8891,7 +8837,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -8923,7 +8869,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -8957,7 +8903,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -8969,8 +8915,8 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -9090,7 +9036,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -9125,7 +9071,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+    *:-:* | *:-) cat >"$tmp/stdin" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
@@ -9256,22 +9202,21 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -9282,20 +9227,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
+      mv "$tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
diff --git a/configure.in b/configure.in
index 2ad7906353..8d5ed59f6c 100644
--- a/configure.in
+++ b/configure.in
@@ -194,12 +194,6 @@ AC_ARG_WITH([tls],
 	    [usetls=$withval],
 	    [usetls=yes])
 
-AC_ARG_WITH([__thread],
-	    AC_HELP_STRING([--without-__thread],
-			   [do not use TLS features even when supporting them]),
-	    [use__thread=$withval],
-	    [use__thread=yes])
-
 AC_ARG_ENABLE([hidden-plt],
 	      AC_HELP_STRING([--disable-hidden-plt],
 			     [do not hide internal function calls to avoid PLT]),
@@ -2078,10 +2072,9 @@ else
   libc_cv_ld_no_whole_archive=no
 fi
 rm -f conftest*])
-if test $libc_cv_ld_no_whole_archive = yes; then
-  no_whole_archive=-Wl,--no-whole-archive
+if test $libc_cv_ld_no_whole_archive = no; then
+  AC_MSG_ERROR([support for --no-whole-archive is needed])
 fi
-AC_SUBST(no_whole_archive)dnl
 
 AC_CACHE_CHECK(for gcc -fexceptions, libc_cv_gcc_exceptions, [dnl
 cat > conftest.c <<\EOF
@@ -2133,8 +2126,8 @@ else
   libc_cv_gcc_builtin_expect=no
 fi
 rm -f conftest*])
-if test "$libc_cv_gcc_builtin_expect" = yes; then
-  AC_DEFINE(HAVE_BUILTIN_EXPECT)
+if test "$libc_cv_gcc_builtin_expect" = no; then
+  AC_MSG_ERROR([support for __builtin_expect needed])
 fi
 
 AC_CACHE_CHECK(for __builtin_memset, libc_cv_gcc_builtin_memset, [dnl
@@ -2172,44 +2165,38 @@ else
   libc_cv_gcc_builtin_redirection=no
 fi
 rm -f conftest* ])
-if test "$libc_cv_gcc_builtin_redirection" = yes ; then
-  AC_DEFINE(HAVE_BUILTIN_REDIRECTION)
+if test "$libc_cv_gcc_builtin_redirection" = no; then
+  AC_MSG_ERROR([support for the symbol redirection needed])
 fi
 
 dnl Check whether the compiler supports the __thread keyword.
-if test "x$use__thread" != xno; then
-  AC_CACHE_CHECK([for __thread], libc_cv_gcc___thread,
-  [cat > conftest.c <<\EOF
+AC_CACHE_CHECK([for __thread], libc_cv_gcc___thread,
+[cat > conftest.c <<\EOF
 __thread int a = 42;
 EOF
-  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then
-    libc_cv_gcc___thread=yes
-  else
-    libc_cv_gcc___thread=no
-  fi
-  rm -f conftest*])
-  if test "$libc_cv_gcc___thread" = yes; then
-    AC_DEFINE(HAVE___THREAD)
-  fi
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then
+  libc_cv_gcc___thread=yes
 else
   libc_cv_gcc___thread=no
 fi
+rm -f conftest*])
+if test "$libc_cv_gcc___thread" = no; then
+  AC_MSG_ERROR([support for the __thread keyword is required])
+fi
 
-if test "$libc_cv_gcc___thread" = yes; then
-  dnl Check whether the compiler supports the tls_model attribute.
-  AC_CACHE_CHECK([for tls_model attribute], libc_cv_gcc_tls_model_attr, [dnl
-  cat > conftest.c <<\EOF
+dnl Check whether the compiler supports the tls_model attribute.
+AC_CACHE_CHECK([for tls_model attribute], libc_cv_gcc_tls_model_attr, [dnl
+cat > conftest.c <<\EOF
 extern __thread int a __attribute__((tls_model ("initial-exec")));
 EOF
-  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -S -Werror conftest.c >&AS_MESSAGE_LOG_FD]); then
-    libc_cv_gcc_tls_model_attr=yes
-  else
-    libc_cv_gcc_tls_model_attr=no
-  fi
-  rm -f conftest*])
-  if test "$libc_cv_gcc_tls_model_attr" = yes; then
-    AC_DEFINE(HAVE_TLS_MODEL_ATTRIBUTE)
-  fi
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -S -Werror conftest.c >&AS_MESSAGE_LOG_FD]); then
+  libc_cv_gcc_tls_model_attr=yes
+else
+  libc_cv_gcc_tls_model_attr=no
+fi
+rm -f conftest*])
+if test "$libc_cv_gcc_tls_model_attr" = no; then
+  AC_MSG_ERROR([support for the tls_model attribute is required])
 fi
 
 if test -n "$submachine"; then
@@ -2327,9 +2314,6 @@ if test x$libc_cv_gcc_unwind_find_fde = xyes; then
 fi
 AC_SUBST(libc_cv_gcc_unwind_find_fde)
 
-dnl This is tested by existing code and it's simpler to avoid changing it.
-AC_DEFINE(USE_IN_LIBIO)
-
 # Test for old glibc 2.0.x headers so that they can be removed properly
 # Search only in includedir.
 AC_MSG_CHECKING(for old glibc 2.0.x headers)
diff --git a/csu/Versions b/csu/Versions
index f0b4f00549..4ddf0d5b0b 100644
--- a/csu/Versions
+++ b/csu/Versions
@@ -4,23 +4,12 @@ libc {
   GLIBC_2.0 {
     # helper functions
     __libc_init_first; __libc_start_main;
-
-%if !HAVE___THREAD
-    # global variables
-    _errno;
-
-    # variables in normal name space
-    errno;
-%endif
   }
   GLIBC_2.1 {
     # New special glibc functions.
     gnu_get_libc_release; gnu_get_libc_version;
   }
   GLIBC_PRIVATE {
-%if HAVE___THREAD
-    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
     errno;
-%endif
   }
 }
diff --git a/csu/init.c b/csu/init.c
index 129609e084..559d13e647 100644
--- a/csu/init.c
+++ b/csu/init.c
@@ -1,5 +1,5 @@
 /* Special startup support.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2011 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
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#if defined USE_IN_LIBIO && defined __GNUC__ && __GNUC__ >= 2
+#if defined __GNUC__ && __GNUC__ >= 2
 
 #include <_G_config.h>
 
diff --git a/elf/tst-audit2.c b/elf/tst-audit2.c
index fd089b6f64..b4fa906940 100644
--- a/elf/tst-audit2.c
+++ b/elf/tst-audit2.c
@@ -4,11 +4,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE___THREAD
-# define MAGIC1 0xabcdef72
-# define MAGIC2 0xd8675309
+#define MAGIC1 0xabcdef72
+#define MAGIC2 0xd8675309
 static __thread unsigned int magic[] = { MAGIC1, MAGIC2 };
-#endif
 
 #undef calloc
 
@@ -18,7 +16,6 @@ static __thread unsigned int magic[] = { MAGIC1, MAGIC2 };
 void *
 calloc (size_t n, size_t m)
 {
-#if HAVE___THREAD
   if (magic[0] != MAGIC1 || magic[1] != MAGIC2)
     {
       printf ("{%x, %x} != {%x, %x}\n", magic[0], magic[1], MAGIC1, MAGIC2);
@@ -26,7 +23,6 @@ calloc (size_t n, size_t m)
     }
   magic[0] = MAGIC2;
   magic[1] = MAGIC1;
-#endif
 
   n *= m;
   void *ptr = malloc (n);
@@ -38,13 +34,11 @@ calloc (size_t n, size_t m)
 int
 main (void)
 {
-#if HAVE___THREAD
   if (magic[1] != MAGIC1 || magic[0] != MAGIC2)
     {
       printf ("{%x, %x} != {%x, %x}\n", magic[0], magic[1], MAGIC2, MAGIC1);
       return 1;
     }
-#endif
 
   return 0;
 }
diff --git a/elf/tst-tls10.c b/elf/tst-tls10.c
index dbcc69727c..347243f66b 100644
--- a/elf/tst-tls10.c
+++ b/elf/tst-tls10.c
@@ -1,9 +1,7 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A local = { 1, 2, 3 };
-#endif
 
 #define CHECK(N, S)					\
   p = f##N##a ();					\
@@ -13,7 +11,6 @@ __thread struct A local = { 1, 2, 3 };
 int
 main (void)
 {
-#ifdef USE_TLS__THREAD
   struct A *p;
   if (local.a != 1 || local.b != 2 || local.c != 3)
     abort ();
@@ -35,6 +32,6 @@ main (void)
     abort ();
   CHECK (9, 28);
   CHECK (10, 31);
-#endif
+
   exit (0);
 }
diff --git a/elf/tst-tls10.h b/elf/tst-tls10.h
index bffc332a0a..2b5709af72 100644
--- a/elf/tst-tls10.h
+++ b/elf/tst-tls10.h
@@ -1,9 +1,6 @@
 #include <tls.h>
 #include <stdlib.h>
 
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
-# define USE_TLS__THREAD
-
 struct A
 {
   char a;
@@ -34,4 +31,3 @@ extern int f9b (void);
 extern int f10b (void);
 extern void check1 (void);
 extern void check2 (void);
-#endif
diff --git a/elf/tst-tls11.c b/elf/tst-tls11.c
index 816cf5cc2f..8a2fef4a7f 100644
--- a/elf/tst-tls11.c
+++ b/elf/tst-tls11.c
@@ -8,7 +8,6 @@
 int
 main (void)
 {
-#ifdef USE_TLS__THREAD
   struct A *p;
   check1 ();
   check2 ();
@@ -22,6 +21,6 @@ main (void)
   CHECK (8, 25);
   CHECK (9, 28);
   CHECK (10, 31);
-#endif
+
   exit (0);
 }
diff --git a/elf/tst-tls12.c b/elf/tst-tls12.c
index 84aa7d35ca..9086d17176 100644
--- a/elf/tst-tls12.c
+++ b/elf/tst-tls12.c
@@ -8,11 +8,10 @@
 int
 main (void)
 {
-#ifdef USE_TLS__THREAD
   struct A *p;
   check1 ();
   CHECK (1, 4);
   CHECK (2, 7);
-#endif
+
   exit (0);
 }
diff --git a/elf/tst-tls14.c b/elf/tst-tls14.c
index c1e6ba7e2c..ffd31e97be 100644
--- a/elf/tst-tls14.c
+++ b/elf/tst-tls14.c
@@ -6,9 +6,7 @@
 
 #include <tls.h>
 
-#if HAVE___THREAD
-
-# define AL 4096
+#define AL 4096
 struct foo
 {
   int i;
@@ -55,12 +53,5 @@ do_test (void)
   return result;
 }
 
-# define TEST_FUNCTION do_test ()
-
-#else
-
-# define TEST_FUNCTION 0
-
-#endif
-
+#define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/elf/tst-tlsmod11.c b/elf/tst-tlsmod11.c
index 9938b5753a..cffbd68edc 100644
--- a/elf/tst-tlsmod11.c
+++ b/elf/tst-tlsmod11.c
@@ -1,6 +1,4 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread struct A a1 = { 4, 5, 6 };
 __thread struct A a2 = { 7, 8, 9 };
-#endif
diff --git a/elf/tst-tlsmod12.c b/elf/tst-tlsmod12.c
index 4602709a18..d0be51891a 100644
--- a/elf/tst-tlsmod12.c
+++ b/elf/tst-tlsmod12.c
@@ -1,6 +1,5 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 extern __thread struct A a2 __attribute__((tls_model("initial-exec")));
 
 void
@@ -11,4 +10,3 @@ check1 (void)
   if (a2.a != 7 || a2.b != 8 || a2.c != 9)
     abort ();
 }
-#endif
diff --git a/elf/tst-tlsmod13.c b/elf/tst-tlsmod13.c
index e4e23af2d8..76da630a05 100644
--- a/elf/tst-tlsmod13.c
+++ b/elf/tst-tlsmod13.c
@@ -1,10 +1,6 @@
 #include <tls.h>
 
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 __thread int a[2] __attribute__ ((tls_model ("initial-exec")));
-#else
-int a[2];
-#endif
 
 int
 foo (void)
diff --git a/elf/tst-tlsmod13a.c b/elf/tst-tlsmod13a.c
index 70a02131ee..d5515d4a15 100644
--- a/elf/tst-tlsmod13a.c
+++ b/elf/tst-tlsmod13a.c
@@ -1,10 +1,6 @@
 #include <tls.h>
 
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 __thread int b[2] __attribute__ ((tls_model ("initial-exec")));
-#else
-int b[2];
-#endif
 
 extern int foo (void);
 
diff --git a/elf/tst-tlsmod14a.c b/elf/tst-tlsmod14a.c
index ad1d179aac..6806d3403c 100644
--- a/elf/tst-tlsmod14a.c
+++ b/elf/tst-tlsmod14a.c
@@ -3,9 +3,7 @@
 
 #include <tls.h>
 
-#if HAVE___THREAD
-
-# define AL 4096
+#define AL 4096
 struct foo
 {
   int i;
@@ -15,9 +13,9 @@ static __thread struct foo f;
 static struct foo g;
 
 
-# ifndef FCT
-#  define FCT in_dso1
-# endif
+#ifndef FCT
+# define FCT in_dso1
+#endif
 
 
 int
@@ -37,5 +35,3 @@ FCT (void)
 
   return result;
 }
-
-#endif
diff --git a/elf/tst-tlsmod15b.c b/elf/tst-tlsmod15b.c
index 4f63eab144..b37283686a 100644
--- a/elf/tst-tlsmod15b.c
+++ b/elf/tst-tlsmod15b.c
@@ -1,6 +1,5 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread int mod15b_var __attribute__((tls_model("initial-exec")));
 
 int
@@ -8,10 +7,3 @@ in_dso (void)
 {
   return mod15b_var;
 }
-#else
-int
-in_dso (void)
-{
-  return 0;
-}
-#endif
diff --git a/elf/tst-tlsmod16a.c b/elf/tst-tlsmod16a.c
index 847c8090f5..c16e603c8b 100644
--- a/elf/tst-tlsmod16a.c
+++ b/elf/tst-tlsmod16a.c
@@ -1,7 +1,3 @@
 #include <tls.h>
 
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 int __thread tlsvar;
-#else
-int tlsvar;
-#endif
diff --git a/elf/tst-tlsmod16b.c b/elf/tst-tlsmod16b.c
index 308e6bae92..7268c56bcb 100644
--- a/elf/tst-tlsmod16b.c
+++ b/elf/tst-tlsmod16b.c
@@ -1,10 +1,6 @@
 #include <tls.h>
 
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 extern __thread int tlsvar __attribute__((tls_model("initial-exec")));
-#else
-extern int tlsvar;
-#endif
 
 void *
 in_dso (void)
diff --git a/elf/tst-tlsmod7.c b/elf/tst-tlsmod7.c
index 944b97f9c0..3df7907bcf 100644
--- a/elf/tst-tlsmod7.c
+++ b/elf/tst-tlsmod7.c
@@ -1,6 +1,5 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a1 = { 4, 5, 6 };
 __thread struct A a2 = { 7, 8, 9 };
@@ -100,4 +99,3 @@ f6b (void)
 {
   return local2.c;
 }
-#endif
diff --git a/elf/tst-tlsmod8.c b/elf/tst-tlsmod8.c
index c1822fc0cf..89772ac42f 100644
--- a/elf/tst-tlsmod8.c
+++ b/elf/tst-tlsmod8.c
@@ -1,6 +1,5 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread long long dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a2 = { 22, 23, 24 };
 __thread struct A a4 __attribute__((tls_model("initial-exec")))
@@ -69,4 +68,3 @@ f10b (void)
 {
   return local2.c;
 }
-#endif
diff --git a/elf/tst-tlsmod9.c b/elf/tst-tlsmod9.c
index e124144e47..6b11ed58b8 100644
--- a/elf/tst-tlsmod9.c
+++ b/elf/tst-tlsmod9.c
@@ -1,6 +1,5 @@
 #include "tst-tls10.h"
 
-#ifdef USE_TLS__THREAD
 __thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a1 = { 4, 5, 6 };
 __thread struct A a3 __attribute__((tls_model("initial-exec")))
@@ -98,4 +97,3 @@ f6b (void)
 {
   return local2.c;
 }
-#endif
diff --git a/gmon/gmon.c b/gmon/gmon.c
index af2ac1c0f6..0d2ed0594e 100644
--- a/gmon/gmon.c
+++ b/gmon/gmon.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1983, 1992, 1993
+ * Copyright (c) 1983, 1992, 1993, 2011
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <wchar.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,9 +46,6 @@
 #include <libc-internal.h>
 #include <not-cancel.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
 
 /*  Head of basic-block list or NULL. */
 struct __bb *__bb_head attribute_hidden;
@@ -194,7 +192,7 @@ write_hist (fd)
 	char dimen_abbrev;
       } thdr;
       struct iovec iov[3] =
-        {
+	{
 	  { &tag, sizeof (tag) },
 	  { &thdr, sizeof (struct gmon_hist_hdr) },
 	  { _gmonparam.kcount, _gmonparam.kcountsize }
diff --git a/grp/fgetgrent_r.c b/grp/fgetgrent_r.c
index 8278a4516b..f7135ee903 100644
--- a/grp/fgetgrent_r.c
+++ b/grp/fgetgrent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996-1999, 2000, 2011 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
@@ -21,11 +21,9 @@
 #include <grp.h>
 #include <stdio.h>
 
-#ifdef USE_IN_LIBIO
-# include <libio/iolibio.h>
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#include <libio/iolibio.h>
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 /* Define a line parsing function using the common code
    used in the nss_files module.  */
diff --git a/grp/putgrent.c b/grp/putgrent.c
index 382d6a4daa..6d7dce9d73 100644
--- a/grp/putgrent.c
+++ b/grp/putgrent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,96,98,99,2000,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,96,98,99,2000,2005,2011 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
@@ -20,10 +20,8 @@
 #include <stdio.h>
 #include <grp.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 #define _S(x)	x ? x : ""
 
diff --git a/hurd/fopenport.c b/hurd/fopenport.c
index 5dcb5ab30a..d01b9f3f35 100644
--- a/hurd/fopenport.c
+++ b/hurd/fopenport.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,97,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1994,1995,1997,2000-2002,2011 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
@@ -63,11 +63,7 @@ writeio (void *cookie, const char *buf, size_t n)
    Returns zero if successful, nonzero if not.  */
 static int
 seekio (void *cookie,
-#ifdef USE_IN_LIBIO
 	_IO_off64_t *pos,
-#else
-	fpos_t *pos,
-#endif
 	int whence)
 {
   error_t err = __io_seek ((file_t) cookie, *pos, whence, pos);
@@ -86,12 +82,8 @@ closeio (void *cookie)
   return 0;
 }
 
-#ifdef USE_IN_LIBIO
 #include "../libio/libioP.h"
 #define fopencookie _IO_fopencookie
-#else
-#define cookie_io_functions_t __io_functions
-#endif
 static const cookie_io_functions_t funcsio =
 { readio, writeio, seekio, closeio };
 
diff --git a/hurd/vpprintf.c b/hurd/vpprintf.c
index 7967998163..0b09df34d8 100644
--- a/hurd/vpprintf.c
+++ b/hurd/vpprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,94,97,2000,01 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,97,2000,01,11 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
@@ -21,9 +21,7 @@
 #include <string.h>
 #include <hurd.h>
 
-#ifdef USE_IN_LIBIO
-# include <libioP.h>
-#endif
+#include <libioP.h>
 
 static ssize_t
 do_write (void *cookie,	const char *buf, size_t n)
@@ -42,8 +40,6 @@ vpprintf (io_t port, const char *format, va_list arg)
 {
   int done;
 
-#ifdef USE_IN_LIBIO
-
   struct locked_FILE
   {
     struct _IO_cookie_file cfile;
@@ -60,24 +56,5 @@ vpprintf (io_t port, const char *format, va_list arg)
 
   done = _IO_vfprintf (&temp_f.cfile.__fp.file, format, arg);
 
-#else
-
-  FILE f;
-
-  /* Create an unbuffered stream talking to PORT on the stack.  */
-  memset ((void *) &f, 0, sizeof (f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__write = 1;
-  f.__cookie = (void *) port;
-  f.__room_funcs = __default_room_functions;
-  f.__io_funcs.__write = do_write;
-  f.__seen = 1;
-  f.__userbuf = 1;
-
-  /* vfprintf will use a buffer on the stack for the life of the call.  */
-  done = vfprintf (&f, format, arg);
-
-#endif
-
   return done;
 }
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 2023beb267..b28cb3c9ab 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -1,5 +1,5 @@
 /* Handle configuration data.
-   Copyright (C) 1997-2003, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003, 2005, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -90,10 +90,8 @@ static const char builtin_aliases[] =
 #undef BUILTIN_ALIAS
 };
 
-#ifdef USE_IN_LIBIO
-# include <libio/libioP.h>
-# define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
-#endif
+#include <libio/libioP.h>
+#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
 
 
 /* Value of the GCONV_PATH environment variable.  */
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 67e1ca2083..851efc5c28 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -216,11 +216,6 @@
 # define internal_function	/* empty */
 #endif
 
-/* Prepare for the case that `__builtin_expect' is not available.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
 /* Determine the return address.  */
 #define RETURN_ADDRESS(nr) \
   __builtin_extract_return_addr (__builtin_return_address (nr))
@@ -460,11 +455,7 @@ for linking")
 # define attribute_hidden
 #endif
 
-#ifdef HAVE_TLS_MODEL_ATTRIBUTE
-# define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
-#else
-# define attribute_tls_model_ie
-#endif
+#define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
 
 #define attribute_relro __attribute__ ((section (".data.rel.ro")))
 
@@ -794,22 +785,12 @@ for linking")
 # define libnss_nisplus_hidden_data_ver(local, name)
 #endif
 
-#ifdef HAVE_BUILTIN_REDIRECTION
-# define libc_hidden_builtin_proto(name, attrs...) libc_hidden_proto (name, ##attrs)
-# define libc_hidden_builtin_def(name) libc_hidden_def (name)
-# define libc_hidden_builtin_weak(name) libc_hidden_weak (name)
-# define libc_hidden_builtin_ver(local, name) libc_hidden_ver (local, name)
-# ifdef __ASSEMBLER__
-#  define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
-# endif
-#else
-# define libc_hidden_builtin_proto(name, attrs...)
-# define libc_hidden_builtin_def(name)
-# define libc_hidden_builtin_weak(name)
-# define libc_hidden_builtin_ver(local, name)
-# ifdef __ASSEMBLER__
-#  define HIDDEN_BUILTIN_JUMPTARGET(name) JUMPTARGET(name)
-# endif
+#define libc_hidden_builtin_proto(name, attrs...) libc_hidden_proto (name, ##attrs)
+#define libc_hidden_builtin_def(name) libc_hidden_def (name)
+#define libc_hidden_builtin_weak(name) libc_hidden_weak (name)
+#define libc_hidden_builtin_ver(local, name) libc_hidden_ver (local, name)
+#ifdef __ASSEMBLER__
+# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
 #endif
 
 #if defined NOT_IN_libc && defined IS_IN_libutil
diff --git a/include/tls.h b/include/tls.h
index 1642456a73..8ee2b947be 100644
--- a/include/tls.h
+++ b/include/tls.h
@@ -5,7 +5,7 @@
 
 #include_next <tls.h>
 
-#if HAVE___THREAD && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if !defined NOT_IN_libc || defined IS_IN_libpthread
 
 # define USE___THREAD 1
 
diff --git a/intl/gettextP.h b/intl/gettextP.h
index f1aa329e47..381e0f18e1 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001, 2004-2005, 2007
+   Copyright (C) 1995-1999, 2000, 2001, 2004-2005, 2007, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
@@ -54,12 +54,6 @@
 # define attribute_hidden
 #endif
 
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 2c1b44cec4..52abfc3c6a 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2002-2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -44,12 +44,6 @@
 # define internal_function
 #endif
 
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
 /* Encoding of locale name parts.  */
 #define XPG_NORM_CODESET	1
 #define XPG_CODESET		2
diff --git a/locale/global-locale.c b/locale/global-locale.c
index 63d1238fb0..c5681a736f 100644
--- a/locale/global-locale.c
+++ b/locale/global-locale.c
@@ -1,5 +1,5 @@
 /* Locale object representing the global locale controlled by setlocale.
-   Copyright (C) 2002, 2006, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2008, 2010, 2011 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
@@ -60,16 +60,6 @@ struct __locale_struct _nl_global_locale attribute_hidden =
   };
 
 #include <tls.h>
-#if HAVE___THREAD
+
 /* The tsd macros don't permit an initializer.  */
 __thread __locale_t __libc_tsd_LOCALE = &_nl_global_locale;
-#else
-__libc_tsd_define (, __locale_t, LOCALE)
-/* This is a bad kludge presuming the variable name used by the macros.
-   Using typeof makes sure to barf if we do not match the macro definition.
-   This ifndef is a further bad kludge for Hurd, where there is an explicit
-   initialization.  */
-# ifndef _HURD_THREADVAR_H
-__typeof (__libc_tsd_LOCALE_data) __libc_tsd_LOCALE_data = &_nl_global_locale;
-# endif
-#endif
diff --git a/locale/localeinfo.h b/locale/localeinfo.h
index 72e9d3a6ea..6cf05b2154 100644
--- a/locale/localeinfo.h
+++ b/locale/localeinfo.h
@@ -1,5 +1,5 @@
 /* Declarations for internal libc locale interfaces
-   Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -216,7 +216,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE)
    unused.  We can manage this playing some tricks with weak references.
    But with thread-local locale settings, it becomes quite ungainly unless
    we can use __thread variables.  So only in that case do we attempt this.  */
-#if !defined SHARED && defined HAVE___THREAD && defined HAVE_WEAK_SYMBOLS
+#if !defined SHARED && defined HAVE_WEAK_SYMBOLS
 # include <tls.h>
 # define NL_CURRENT_INDIRECT	1
 #endif
diff --git a/mach/devstream.c b/mach/devstream.c
index 1c51695a87..ebc4b9329b 100644
--- a/mach/devstream.c
+++ b/mach/devstream.c
@@ -1,6 +1,6 @@
 /* stdio on a Mach device port.
    Translates \n to \r\n on output, echos and translates \r to \n on input.
-   Copyright (C) 1992,93,94,96,97,2000 Free Software Foundation, Inc.
+   Copyright (C) 1992,93,94,96,97,2000,2011 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
@@ -120,12 +120,10 @@ dealloc_ref (void *cookie)
   return 0;
 }
 
-#ifndef USE_IN_LIBIO
 #define cookie_io_functions_t __io_functions
 #define write __write
 #define read __read
 #define close __close
-#endif
 
 FILE *
 mach_open_devstream (mach_port_t dev, const char *mode)
diff --git a/malloc/arena.c b/malloc/arena.c
index 59e96dbf09..29d8b2da47 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2009,2010
+   Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
@@ -484,29 +484,6 @@ ptmalloc_init (void)
 #endif
     ptmalloc_init_minimal();
 
-#ifndef NO_THREADS
-# if defined _LIBC
-  /* We know __pthread_initialize_minimal has already been called,
-     and that is enough.  */
-#   define NO_STARTER
-# endif
-# ifndef NO_STARTER
-  /* With some threads implementations, creating thread-specific data
-     or initializing a mutex may call malloc() itself.  Provide a
-     simple starter version (realloc() won't work). */
-  save_malloc_hook = __malloc_hook;
-  save_memalign_hook = __memalign_hook;
-  save_free_hook = __free_hook;
-  __malloc_hook = malloc_starter;
-  __memalign_hook = memalign_starter;
-  __free_hook = free_starter;
-#  ifdef _LIBC
-  /* Initialize the pthreads interface. */
-  if (__pthread_initialize != NULL)
-    __pthread_initialize();
-#  endif /* !defined _LIBC */
-# endif	/* !defined NO_STARTER */
-#endif /* !defined NO_THREADS */
   mutex_init(&main_arena.mutex);
   main_arena.next = &main_arena;
 
@@ -526,15 +503,6 @@ ptmalloc_init (void)
   tsd_key_create(&arena_key, NULL);
   tsd_setspecific(arena_key, (Void_t *)&main_arena);
   thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2);
-#ifndef NO_THREADS
-# ifndef NO_STARTER
-  __malloc_hook = save_malloc_hook;
-  __memalign_hook = save_memalign_hook;
-  __free_hook = save_free_hook;
-# else
-#  undef NO_STARTER
-# endif
-#endif
 #ifdef _LIBC
   secure = __libc_enable_secure;
   s = NULL;
diff --git a/malloc/set-freeres.c b/malloc/set-freeres.c
index 6123141ed1..dfd4641a71 100644
--- a/malloc/set-freeres.c
+++ b/malloc/set-freeres.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1999-2003,2011 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
@@ -21,9 +21,7 @@
 #include <set-hooks.h>
 #include <libc-internal.h>
 
-#ifdef USE_IN_LIBIO
-# include "../libio/libioP.h"
-#endif
+#include "../libio/libioP.h"
 
 DEFINE_HOOK (__libc_subfreeres, (void));
 
@@ -40,9 +38,7 @@ __libc_freeres (void)
     {
       void * const *p;
 
-#ifdef USE_IN_LIBIO
       _IO_cleanup ();
-#endif
 
       RUN_HOOK (__libc_subfreeres, ());
 
diff --git a/misc/err.c b/misc/err.c
index 716f994517..2a15bac08d 100644
--- a/misc/err.c
+++ b/misc/err.c
@@ -1,5 +1,5 @@
 /* 4.4BSD utility functions for error messages.
-   Copyright (C) 1995,96,98,2001,02 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1998,2001,2002,2011 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
@@ -24,11 +24,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#include <wchar.h>
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 extern char *__progname;
 
@@ -40,11 +38,10 @@ extern char *__progname;
   va_end (ap);								      \
 }
 
-#ifdef USE_IN_LIBIO
 static void
 convert_and_print (const char *format, __gnuc_va_list ap)
 {
-# define ALLOCA_LIMIT	2000
+#define ALLOCA_LIMIT	2000
   size_t len;
   wchar_t *wformat = NULL;
   mbstate_t st;
@@ -85,13 +82,11 @@ convert_and_print (const char *format, __gnuc_va_list ap)
 
   __vfwprintf (stderr, wformat, ap);
 }
-#endif
 
 void
 vwarnx (const char *format, __gnuc_va_list ap)
 {
   flockfile (stderr);
-#ifdef USE_IN_LIBIO
   if (_IO_fwide (stderr, 0) > 0)
     {
       __fwprintf (stderr, L"%s: ", __progname);
@@ -99,7 +94,6 @@ vwarnx (const char *format, __gnuc_va_list ap)
       putwc_unlocked (L'\n', stderr);
     }
   else
-#endif
     {
       fprintf (stderr, "%s: ", __progname);
       if (format)
@@ -116,7 +110,6 @@ vwarn (const char *format, __gnuc_va_list ap)
   int error = errno;
 
   flockfile (stderr);
-#ifdef USE_IN_LIBIO
   if (_IO_fwide (stderr, 0) > 0)
     {
       __fwprintf (stderr, L"%s: ", __progname);
@@ -129,7 +122,6 @@ vwarn (const char *format, __gnuc_va_list ap)
       __fwprintf (stderr, L"%m\n");
     }
   else
-#endif
     {
       fprintf (stderr, "%s: ", __progname);
       if (format)
diff --git a/misc/getttyent.c b/misc/getttyent.c
index 7560170890..6d789c4e2e 100644
--- a/misc/getttyent.c
+++ b/misc/getttyent.c
@@ -37,10 +37,8 @@ static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
 #include <ctype.h>
 #include <string.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 static char zapchar;
 static FILE *tf;
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 6959f0e21d..0e9835c61e 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -25,10 +25,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 #undef __setmntent
 #undef __endmntent
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 04c2baab9b..3b94006eef 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-10  Ulrich Drepper  <drepper@gmail.com>
+
+	* tst-tls1.c: Support for __thread is now mandatory.
+	* tst-tls2.c: Likewise.
+	* tst-tls3.c: Likewise.
+	* tst-tls3mod.c: Likewise.
+	* tst-tls4.c: Likewise.
+	* tst-tls4moda.c: Likewise.
+	* tst-tls4modb.c: Likewise.
+	* tst-tls5.h: Likewise.
+
 2011-09-08  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #12403]
diff --git a/nptl/tst-tls1.c b/nptl/tst-tls1.c
index 4e191222a7..f79db4a1c1 100644
--- a/nptl/tst-tls1.c
+++ b/nptl/tst-tls1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 
-#if HAVE___THREAD
 struct test_s
 {
   int a;
@@ -52,19 +51,11 @@ tf (void *arg)
 
   return NULL;
 }
-#endif
 
 
 int
 do_test (void)
 {
-#if !HAVE___THREAD
-
-  puts ("No __thread support in compiler, test skipped.");
-
-  return 0;
-#else
-
   if (s.a != INIT_A || s.b != INIT_B)
     {
       puts ("initial value of s in main thread wrong");
@@ -114,7 +105,6 @@ do_test (void)
     }
 
   return 0;
-#endif
 }
 
 
diff --git a/nptl/tst-tls2.c b/nptl/tst-tls2.c
index 73ed33eb6a..ff3ab3a024 100644
--- a/nptl/tst-tls2.c
+++ b/nptl/tst-tls2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if HAVE___THREAD
 
 #define N 10
 static pthread_t th[N];
@@ -106,18 +105,11 @@ tf (void *arg)
 
   return NULL;
 }
-#endif
+
 
 int
 do_test (void)
 {
-#if !HAVE___THREAD
-
-  puts ("No __thread support in compiler, test skipped.");
-
-  return 0;
-#else
-
   if (pthread_barrier_init (&b, NULL, N + 1) != 0)
     {
       puts ("barrier_init failed");
@@ -207,7 +199,6 @@ do_test (void)
       }
 
   return 0;
-#endif
 }
 
 
diff --git a/nptl/tst-tls3.c b/nptl/tst-tls3.c
index 8c2663bb04..87883b0bdd 100644
--- a/nptl/tst-tls3.c
+++ b/nptl/tst-tls3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -73,13 +73,6 @@ int nsigs;
 int
 do_test (void)
 {
-#if !HAVE___THREAD
-
-  puts ("No __thread support in compiler, test skipped.");
-
-  return 0;
-#else
-
   if ((uintptr_t) pthread_self () & (TCB_ALIGNMENT - 1))
     {
       puts ("initial thread's struct pthread not aligned enough");
@@ -206,7 +199,6 @@ do_test (void)
     }
 
   return 0;
-#endif
 }
 
 
diff --git a/nptl/tst-tls3mod.c b/nptl/tst-tls3mod.c
index 4cb96452e2..8ca9956d68 100644
--- a/nptl/tst-tls3mod.c
+++ b/nptl/tst-tls3mod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <pthreaddef.h>
 
-#if HAVE___THREAD
 
 extern pthread_barrier_t b;
 
@@ -88,5 +87,3 @@ tf (void *arg)
 
   return NULL;
 }
-
-#endif
diff --git a/nptl/tst-tls4.c b/nptl/tst-tls4.c
index 52775dee8c..d33c97216e 100644
--- a/nptl/tst-tls4.c
+++ b/nptl/tst-tls4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <tls.h>
 
-#if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 
 #define N 3
 
@@ -181,11 +180,4 @@ do_test (void)
 
 #define TIMEOUT 5
 #define TEST_FUNCTION do_test ()
-
-#else
-
-#define TEST_FUNCTION 0
-
-#endif
-
 #include "../test-skeleton.c"
diff --git a/nptl/tst-tls4moda.c b/nptl/tst-tls4moda.c
index ff7ee56042..4f16a36919 100644
--- a/nptl/tst-tls4moda.c
+++ b/nptl/tst-tls4moda.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <tls.h>
 
-#if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 
 static __thread unsigned char foo [32]
   __attribute__ ((tls_model ("initial-exec"), aligned (sizeof (void *))));
@@ -35,7 +34,7 @@ test1 (void)
   for (s = 0; s < sizeof (foo); ++s)
     {
       if (foo [s])
-        abort ();
+	abort ();
       foo [s] = s;
     }
 }
@@ -48,9 +47,7 @@ test2 (void)
   for (s = 0; s < sizeof (foo); ++s)
     {
       if (foo [s] != s)
-        abort ();
+	abort ();
       foo [s] = sizeof (foo) - s;
     }
 }
-
-#endif
diff --git a/nptl/tst-tls4modb.c b/nptl/tst-tls4modb.c
index 99f3b5405f..10cca08fb5 100644
--- a/nptl/tst-tls4modb.c
+++ b/nptl/tst-tls4modb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <tls.h>
 
-#if HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
 
 static int i;
 int bar;
@@ -44,7 +43,7 @@ test1 (void)
   for (s = 0; s < sizeof (foo) / sizeof (void *); ++s)
     {
       if (foo [s])
-        abort ();
+	abort ();
       foo [s] = &foo[s];
     }
 }
@@ -57,9 +56,7 @@ test2 (void)
   for (s = 0; s < sizeof (foo) / sizeof (void *); ++s)
     {
       if (foo [s] != &foo [s])
-        abort ();
+	abort ();
       foo [s] = &foo [s ^ 1];
     }
 }
-
-#endif
diff --git a/nptl/tst-tls5.h b/nptl/tst-tls5.h
index 9a76ab7827..12f68b8196 100644
--- a/nptl/tst-tls5.h
+++ b/nptl/tst-tls5.h
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <tls.h>
 
-#if HAVE___THREAD
 
 struct tls_obj
 {
@@ -24,5 +23,3 @@ tls_register_##x (void)				\
   tls_registry[i].size = sizeof (x);		\
   tls_registry[i].align = __alignof__ (x);	\
 }
-
-#endif
diff --git a/posix/getopt.c b/posix/getopt.c
index 3fa5a4d6d1..ef2b48d366 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -74,7 +74,7 @@
 # define _(msgid) gettext (msgid)
 #endif
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 # include <wchar.h>
 #endif
 
@@ -583,7 +583,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	      first.next = ambig_list;
 	      ambig_list = &first;
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	      char *buf = NULL;
 	      size_t buflen = 0;
 
@@ -652,7 +652,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		{
 		  if (print_errors)
 		    {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		      char *buf;
 		      int n;
 #endif
@@ -660,7 +660,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		      if (argv[d->optind - 1][1] == '-')
 			{
 			  /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 			  n = __asprintf (&buf, _("\
 %s: option '--%s' doesn't allow an argument\n"),
 					  argv[0], pfound->name);
@@ -673,7 +673,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		      else
 			{
 			  /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 			  n = __asprintf (&buf, _("\
 %s: option '%c%s' doesn't allow an argument\n"),
 					  argv[0], argv[d->optind - 1][0],
@@ -686,7 +686,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #endif
 			}
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		      if (n >= 0)
 			{
 			  _IO_flockfile (stderr);
@@ -719,7 +719,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		{
 		  if (print_errors)
 		    {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		      char *buf;
 
 		      if (__asprintf (&buf, _("\
@@ -770,7 +770,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	{
 	  if (print_errors)
 	    {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	      char *buf;
 	      int n;
 #endif
@@ -778,7 +778,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	      if (argv[d->optind][1] == '-')
 		{
 		  /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		  n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"),
 				  argv[0], d->__nextchar);
 #else
@@ -789,7 +789,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	      else
 		{
 		  /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		  n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"),
 				  argv[0], argv[d->optind][0], d->__nextchar);
 #else
@@ -798,7 +798,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #endif
 		}
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	      if (n >= 0)
 		{
 		  _IO_flockfile (stderr);
@@ -836,19 +836,19 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
       {
 	if (print_errors)
 	  {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	    char *buf;
 	    int n;
 #endif
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	    n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
 			    argv[0], c);
 #else
 	    fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c);
 #endif
 
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 	    if (n >= 0)
 	      {
 		_IO_flockfile (stderr);
@@ -894,7 +894,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	  {
 	    if (print_errors)
 	      {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		char *buf;
 
 		if (__asprintf (&buf,
@@ -968,7 +968,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	  {
 	    if (print_errors)
 	      {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		char *buf;
 
 		if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"),
@@ -1008,7 +1008,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		  {
 		    if (print_errors)
 		      {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 			char *buf;
 
 			if (__asprintf (&buf, _("\
@@ -1047,7 +1047,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		  {
 		    if (print_errors)
 		      {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 			char *buf;
 
 			if (__asprintf (&buf, _("\
@@ -1122,7 +1122,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	      {
 		if (print_errors)
 		  {
-#if defined _LIBC && defined USE_IN_LIBIO
+#if defined _LIBC
 		    char *buf;
 
 		    if (__asprintf (&buf, _("\
diff --git a/posix/wordexp.c b/posix/wordexp.c
index 058a7cfbe8..64689d9747 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,5 +1,5 @@
 /* POSIX.2 wordexp implementation.
-   Copyright (C) 1997-2003, 2005, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003,2005,2006,2008,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
 
@@ -38,9 +38,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 #include <wordexp.h>
 #include <kernel-features.h>
 
@@ -854,7 +852,7 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec)
 	  __close (fd);
 	}
       /* Be paranoid.  Check that we actually opened the /dev/null
-         device.  */
+	 device.  */
       if (__builtin_expect (__fxstat64 (_STAT_VER, STDERR_FILENO, &st), 0) != 0
 	  || __builtin_expect (S_ISCHR (st.st_mode), 1) == 0
 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
@@ -862,8 +860,8 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec)
 #endif
 	  )
 	/* It's not the /dev/null device.  Stop right here.  The
-           problem is: how do we stop?  We use _exit() with an
-           hopefully unusual exit code.  */
+	   problem is: how do we stop?  We use _exit() with an
+	   hopefully unusual exit code.  */
 	_exit (90);
     }
 
@@ -1062,7 +1060,7 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
 		  if (copying == 3)
 		    {
 		      /* Nothing but (IFS) newlines since the last field,
-		         so delimit it here before starting new word */
+			 so delimit it here before starting new word */
 		      if (w_addword (pwordexp, *word) == WRDE_NOSPACE)
 			goto no_space;
 
@@ -1089,7 +1087,7 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
   /* Ensure we don't go back further than the beginning of the
      substitution (i.e. remove maxnewlines bytes at most) */
   while (maxnewlines-- != 0 &&
-         *word_length > 0 && (*word)[*word_length - 1] == '\n')
+	 *word_length > 0 && (*word)[*word_length - 1] == '\n')
     {
       (*word)[--*word_length] = '\0';
 
@@ -1577,7 +1575,7 @@ envsubst:
       if (expand_pattern)
 	{
 	  /* We need to perform tilde expansion, parameter expansion,
-             command substitution, and arithmetic expansion.  We also
+	     command substitution, and arithmetic expansion.  We also
 	     have to be a bit careful with wildcard characters, as
 	     pattern might be given to fnmatch soon.  To do this, we
 	     convert quotes to escapes. */
@@ -1982,7 +1980,7 @@ envsubst:
 	  field_end = field_begin + strcspn (field_begin, ifs);
 
 	  /* Set up pointer to the character after end of field and
-             skip whitespace IFS after it. */
+	     skip whitespace IFS after it. */
 	  next_field = field_end + strspn (field_end, ifs_white);
 
 	  /* Skip at most one non-whitespace IFS character after the field */
diff --git a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c
index bee728ea62..f84f72a660 100644
--- a/pwd/fgetpwent_r.c
+++ b/pwd/fgetpwent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996-1999, 2011 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
@@ -21,10 +21,8 @@
 #include <stdio.h>
 #include <pwd.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 /* Define a line parsing function using the common code
    used in the nss_files module.  */
diff --git a/resolv/Versions b/resolv/Versions
index 4b2e5e9dbc..93faf1e2f5 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -2,11 +2,6 @@
 
 libc {
   GLIBC_2.0 {
-%if !HAVE___THREAD
-    # global variables
-    _h_errno;
-%endif
-
     _res;
 
     # helper functions
@@ -17,9 +12,6 @@ libc {
 
     # variables in normal name space
     h_errlist; h_nerr;
-%if !HAVE___THREAD
-    h_errno;
-%endif
 
     # h*
     herror; hstrerror;
@@ -34,10 +26,7 @@ libc {
   GLIBC_PRIVATE {
     __gai_sigqueue;
 
-%if HAVE___THREAD
-    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
     h_errno; __resp;
-%endif
 
     __res_maybe_init; __res_iclose;
   }
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index fc4b83f7c3..7b167bb3bf 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -46,9 +46,7 @@
 #include <bits/libc-lock.h>
 #include "ifreq.h"
 #include "res_hconf.h"
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 #define _PATH_HOSTCONF	"/etc/host.conf"
 
diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c
index 16747e10cb..2c907a5add 100644
--- a/shadow/fgetspent_r.c
+++ b/shadow/fgetspent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2011 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
@@ -21,10 +21,8 @@
 #include <shadow.h>
 #include <stdio.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 /* Define a line parsing function using the common code
    used in the nss_files module.  */
diff --git a/shadow/putspent.c b/shadow/putspent.c
index dc0bcaafbc..c6b53edb2b 100644
--- a/shadow/putspent.c
+++ b/shadow/putspent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996-1998, 2011 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
@@ -19,10 +19,8 @@
 #include <stdio.h>
 #include <shadow.h>
 
-#ifdef USE_IN_LIBIO
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
 
 #define _S(x)	x ? x : ""
 
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index 551c873c5e..284cc6eec5 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -1,5 +1,5 @@
 /* Print floating point number in hexadecimal notation according to ISO C99.
-   Copyright (C) 1997-2002,2004,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002,2004,2006,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -35,22 +35,16 @@
 
 /* This defines make it possible to use the same code for GNU C library and
    the GNU I/O library.	 */
-#ifdef USE_IN_LIBIO
-# include <libioP.h>
-# define PUT(f, s, n) _IO_sputn (f, s, n)
-# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
+#include <libioP.h>
+#define PUT(f, s, n) _IO_sputn (f, s, n)
+#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
 /* We use this file GNU C library and GNU I/O library.	So make
    names equal.	 */
-# undef putc
-# define putc(c, f) (wide \
+#undef putc
+#define putc(c, f) (wide \
 		     ? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
-# define size_t     _IO_size_t
-# define FILE	     _IO_FILE
-#else	/* ! USE_IN_LIBIO */
-# define PUT(f, s, n) fwrite (s, 1, n, f)
-# define PAD(f, c, n) __printf_pad (f, c, n)
-ssize_t __printf_pad (FILE *, char pad, int n) __THROW; /* In vfprintf.c.  */
-#endif	/* USE_IN_LIBIO */
+#define size_t     _IO_size_t
+#define FILE	     _IO_FILE
 
 /* Macros for doing the actual output.  */
 
diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c
index 69963fd4a9..b1507aed89 100644
--- a/stdio-common/tmpfile.c
+++ b/stdio-common/tmpfile.c
@@ -1,5 +1,5 @@
 /* Open a stdio stream on an anonymous temporary file.  Generic/POSIX version.
-   Copyright (C) 1991,1993,1996-2000,2002,2003,2007,2009
+   Copyright (C) 1991,1993,1996-2000,2002,2003,2007,2009,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -22,12 +22,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#ifdef USE_IN_LIBIO
-# include <iolibio.h>
-# define __fdopen INTUSE(_IO_fdopen)
-# ifndef tmpfile
-#  define tmpfile __new_tmpfile
-# endif
+#include <iolibio.h>
+#define __fdopen INTUSE(_IO_fdopen)
+#ifndef tmpfile
+# define tmpfile __new_tmpfile
 #endif
 
 
@@ -62,7 +60,7 @@ tmpfile (void)
   return f;
 }
 
-#if defined USE_IN_LIBIO && !defined FLAGS /* Not for tmpfile64.  */
+#ifndef FLAGS /* Not for tmpfile64.  */
 # undef tmpfile
 # include <shlib-compat.h>
 versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1);
diff --git a/stdlib/abort.c b/stdlib/abort.c
index e9d0ab18fd..3e517570d7 100644
--- a/stdlib/abort.c
+++ b/stdlib/abort.c
@@ -32,10 +32,8 @@
 # define ABORT_INSTRUCTION
 #endif
 
-#ifdef USE_IN_LIBIO
-# include <libio/libioP.h>
-# define fflush(s) _IO_flush_all_lockp (0)
-#endif
+#include <libio/libioP.h>
+#define fflush(s) _IO_flush_all_lockp (0)
 
 /* Exported variable to locate abort message in core files etc.  */
 struct abort_msg_s *__abort_msg __attribute__ ((nocommon));
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index 2a4d16a461..8ee06bfd06 100644
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1999,2000-2003,2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1999-2003,2005,2006,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,9 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/syslog.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 
 /* We have global data, protect the modification.  */
diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
index 858523eb8d..d3b5dc7dee 100644
--- a/sunrpc/auth_unix.c
+++ b/sunrpc/auth_unix.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle America, Inc.
+ * Copyright (c) 2010, 2011, Oracle America, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -45,15 +45,13 @@
 #include <unistd.h>
 #include <libintl.h>
 #include <sys/param.h>
+#include <wchar.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <rpc/auth.h>
 #include <rpc/auth_unix.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
 
 /*
  * Unix authenticator operations vector
diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
index e6b2460ec5..175370ebfc 100644
--- a/sunrpc/clnt_perr.c
+++ b/sunrpc/clnt_perr.c
@@ -1,7 +1,7 @@
 /*
  * clnt_perror.c
  *
- * Copyright (c) 2010, Oracle America, Inc.
+ * Copyright (c) 2010, 2011, Oracle America, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -34,11 +34,8 @@
 #include <string.h>
 #include <libintl.h>
 #include <rpc/rpc.h>
-
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 static char *auth_errmsg (enum auth_stat stat) internal_function;
 
diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
index a07f50a1b1..7cfbe9e8dd 100644
--- a/sunrpc/clnt_tcp.c
+++ b/sunrpc/clnt_tcp.c
@@ -53,9 +53,7 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <rpc/pmap_clnt.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 extern u_long _create_xid (void);
 
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 83fdd8ef2a..babee9abfd 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -45,9 +45,7 @@
 #include <rpc/pmap_clnt.h>
 #include <net/if.h>
 #include <ifaddrs.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 #include <fcntl.h>
 
 #ifdef IP_RECVERR
diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
index 5d361b3034..62dc8c604b 100644
--- a/sunrpc/clnt_unix.c
+++ b/sunrpc/clnt_unix.c
@@ -54,9 +54,7 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <rpc/pmap_clnt.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 extern u_long _create_xid (void);
 
diff --git a/sunrpc/openchild.c b/sunrpc/openchild.c
index 18c7d105d8..541a223bc4 100644
--- a/sunrpc/openchild.c
+++ b/sunrpc/openchild.c
@@ -41,11 +41,9 @@
 #include <rpc/rpc.h>
 #include <rpc/clnt.h>
 
-#ifdef USE_IN_LIBIO
-# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
-# define __fdopen(fd,m) INTUSE(_IO_fdopen) (fd,m)
-#endif
+#include <libio/iolibio.h>
+#define fflush(s) INTUSE(_IO_fflush) (s)
+#define __fdopen(fd,m) INTUSE(_IO_fdopen) (fd,m)
 
 /*
  * returns pid, or -1 for failure
diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c
index 49b1211bff..b8ba4ab387 100644
--- a/sunrpc/svc_simple.c
+++ b/sunrpc/svc_simple.c
@@ -41,10 +41,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 struct proglst_
   {
diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
index 74f2cd9cf3..e0515322a5 100644
--- a/sunrpc/svc_tcp.c
+++ b/sunrpc/svc_tcp.c
@@ -45,10 +45,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 /*
  * Ops vector for TCP/IP based rpc service handle
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 71be4f8221..04c8407e64 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -45,10 +45,8 @@
 #include <sys/uio.h>
 #endif
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 #define rpc_buffer(xprt) ((xprt)->xp_p1)
 #ifndef MAX
diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
index c74b2cbdc8..2b02682e72 100644
--- a/sunrpc/svc_unix.c
+++ b/sunrpc/svc_unix.c
@@ -46,10 +46,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <libintl.h>
-
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 /*
  * Ops vector for AF_UNIX based rpc service handle
diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
index f770685dea..4dd82ff044 100644
--- a/sunrpc/xdr.c
+++ b/sunrpc/xdr.c
@@ -39,13 +39,11 @@
 #include <limits.h>
 #include <string.h>
 #include <libintl.h>
+#include <wchar.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
 
 /*
  * constants specific to the xdr "protocol"
diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
index 05162ec416..b832078342 100644
--- a/sunrpc/xdr_array.c
+++ b/sunrpc/xdr_array.c
@@ -40,10 +40,7 @@
 #include <rpc/xdr.h>
 #include <libintl.h>
 #include <limits.h>
-
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 #define LASTUNSIGNED	((u_int)0-1)
 
diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
index 1e13d34bab..556c6c4bc0 100644
--- a/sunrpc/xdr_rec.c
+++ b/sunrpc/xdr_rec.c
@@ -47,11 +47,8 @@
 #include <unistd.h>
 #include <rpc/rpc.h>
 #include <libintl.h>
-
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 static bool_t xdrrec_getlong (XDR *, long *);
 static bool_t xdrrec_putlong (XDR *, const long *);
diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
index b4bdb52ef9..7510bed873 100644
--- a/sunrpc/xdr_ref.c
+++ b/sunrpc/xdr_ref.c
@@ -39,11 +39,8 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <libintl.h>
-
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/iolibio.h>
-#endif
+#include <wchar.h>
+#include <libio/iolibio.h>
 
 #define LASTUNSIGNED	((u_int)0-1)
 
diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index c68f004b34..d9866063f9 100644
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -39,13 +39,11 @@
 #include <stdio.h>
 #include <rpc/xdr.h>
 
-#ifdef USE_IN_LIBIO
-# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
-# define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s)
-# define ftell(s) INTUSE(_IO_ftell) (s)
-# define fwrite(p, m, n, s) INTUSE(_IO_fwrite) (p, m, n, s)
-#endif
+#include <libio/iolibio.h>
+#define fflush(s) INTUSE(_IO_fflush) (s)
+#define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s)
+#define ftell(s) INTUSE(_IO_ftell) (s)
+#define fwrite(p, m, n, s) INTUSE(_IO_fwrite) (p, m, n, s)
 
 static bool_t xdrstdio_getlong (XDR *, long *);
 static bool_t xdrstdio_putlong (XDR *, const long *);
author	Ulrich Drepper <drepper@gmail.com>	2011-09-10 14:34:15 -0400
committer	Ulrich Drepper <drepper@gmail.com>	2011-09-10 14:34:15 -0400
commit	3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch)
tree	db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4
parent	1248c1c41508387ff282b208636737e8cdc9b5b0 (diff)
download	glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz