[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r15277 - in /fsf/trunk/libc: ./ argp/ assert/ bits/ csu/ elf/ gmon/ grp/ hurd/ iconv/ include/ inet/ intl/ locale/ mach/ mal...
- To: commits@xxxxxxxxxx
- Subject: [commits] r15277 - in /fsf/trunk/libc: ./ argp/ assert/ bits/ csu/ elf/ gmon/ grp/ hurd/ iconv/ include/ inet/ intl/ locale/ mach/ mal...
- From: eglibc@xxxxxxxxxx
- Date: Sun, 11 Sep 2011 07:48:34 -0000
Author: eglibc
Date: Sun Sep 11 00:48:32 2011
New Revision: 15277
Log:
Import glibc-mainline for 2011-09-11
Removed:
fsf/trunk/libc/include/tls.h
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/Makerules
fsf/trunk/libc/Versions.def
fsf/trunk/libc/argp/argp-fmtstream.c
fsf/trunk/libc/argp/argp-fmtstream.h
fsf/trunk/libc/argp/argp-help.c
fsf/trunk/libc/assert/assert.c
fsf/trunk/libc/bits/libc-tsd.h
fsf/trunk/libc/config.h.in
fsf/trunk/libc/config.make.in
fsf/trunk/libc/configure
fsf/trunk/libc/configure.in
fsf/trunk/libc/csu/Versions
fsf/trunk/libc/csu/errno-loc.c
fsf/trunk/libc/csu/errno.c
fsf/trunk/libc/csu/init.c
fsf/trunk/libc/elf/dl-libc.c
fsf/trunk/libc/elf/dl-tsd.c
fsf/trunk/libc/elf/rtld.c
fsf/trunk/libc/elf/tst-audit2.c
fsf/trunk/libc/elf/tst-tls10.c
fsf/trunk/libc/elf/tst-tls10.h
fsf/trunk/libc/elf/tst-tls11.c
fsf/trunk/libc/elf/tst-tls12.c
fsf/trunk/libc/elf/tst-tls14.c
fsf/trunk/libc/elf/tst-tlsmod11.c
fsf/trunk/libc/elf/tst-tlsmod12.c
fsf/trunk/libc/elf/tst-tlsmod13.c
fsf/trunk/libc/elf/tst-tlsmod13a.c
fsf/trunk/libc/elf/tst-tlsmod14a.c
fsf/trunk/libc/elf/tst-tlsmod15b.c
fsf/trunk/libc/elf/tst-tlsmod16a.c
fsf/trunk/libc/elf/tst-tlsmod16b.c
fsf/trunk/libc/elf/tst-tlsmod7.c
fsf/trunk/libc/elf/tst-tlsmod8.c
fsf/trunk/libc/elf/tst-tlsmod9.c
fsf/trunk/libc/gmon/gmon.c
fsf/trunk/libc/grp/fgetgrent_r.c
fsf/trunk/libc/grp/putgrent.c
fsf/trunk/libc/hurd/fopenport.c
fsf/trunk/libc/hurd/vpprintf.c
fsf/trunk/libc/iconv/gconv_conf.c
fsf/trunk/libc/include/errno.h
fsf/trunk/libc/include/libc-symbols.h
fsf/trunk/libc/include/netdb.h
fsf/trunk/libc/include/resolv.h
fsf/trunk/libc/inet/herrno-loc.c
fsf/trunk/libc/inet/herrno.c
fsf/trunk/libc/intl/gettextP.h
fsf/trunk/libc/intl/loadinfo.h
fsf/trunk/libc/locale/global-locale.c
fsf/trunk/libc/locale/localeinfo.h
fsf/trunk/libc/mach/devstream.c
fsf/trunk/libc/malloc/Makefile
fsf/trunk/libc/malloc/arena.c
fsf/trunk/libc/malloc/hooks.c
fsf/trunk/libc/malloc/malloc.c
fsf/trunk/libc/malloc/set-freeres.c
fsf/trunk/libc/misc/err.c
fsf/trunk/libc/misc/getttyent.c
fsf/trunk/libc/misc/mntent_r.c
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/sysdeps/pthread/malloc-machine.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
fsf/trunk/libc/nptl/tst-tls1.c
fsf/trunk/libc/nptl/tst-tls2.c
fsf/trunk/libc/nptl/tst-tls3.c
fsf/trunk/libc/nptl/tst-tls3mod.c
fsf/trunk/libc/nptl/tst-tls4.c
fsf/trunk/libc/nptl/tst-tls4moda.c
fsf/trunk/libc/nptl/tst-tls4modb.c
fsf/trunk/libc/nptl/tst-tls5.h
fsf/trunk/libc/posix/getopt.c
fsf/trunk/libc/posix/wordexp.c
fsf/trunk/libc/pwd/fgetpwent_r.c
fsf/trunk/libc/resolv/Versions
fsf/trunk/libc/resolv/res-state.c
fsf/trunk/libc/resolv/res_hconf.c
fsf/trunk/libc/resolv/res_libc.c
fsf/trunk/libc/shadow/fgetspent_r.c
fsf/trunk/libc/shadow/putspent.c
fsf/trunk/libc/stdio-common/printf_fphex.c
fsf/trunk/libc/stdio-common/tmpfile.c
fsf/trunk/libc/stdlib/abort.c
fsf/trunk/libc/stdlib/fmtmsg.c
fsf/trunk/libc/sunrpc/auth_unix.c
fsf/trunk/libc/sunrpc/clnt_perr.c
fsf/trunk/libc/sunrpc/clnt_tcp.c
fsf/trunk/libc/sunrpc/clnt_udp.c
fsf/trunk/libc/sunrpc/clnt_unix.c
fsf/trunk/libc/sunrpc/openchild.c
fsf/trunk/libc/sunrpc/svc_simple.c
fsf/trunk/libc/sunrpc/svc_tcp.c
fsf/trunk/libc/sunrpc/svc_udp.c
fsf/trunk/libc/sunrpc/svc_unix.c
fsf/trunk/libc/sunrpc/xdr.c
fsf/trunk/libc/sunrpc/xdr_array.c
fsf/trunk/libc/sunrpc/xdr_rec.c
fsf/trunk/libc/sunrpc/xdr_ref.c
fsf/trunk/libc/sunrpc/xdr_stdio.c
fsf/trunk/libc/sysdeps/i386/dl-machine.h
fsf/trunk/libc/sysdeps/ia64/dl-machine.h
fsf/trunk/libc/sysdeps/powerpc/powerpc32/dl-machine.h
fsf/trunk/libc/sysdeps/powerpc/powerpc64/dl-machine.h
fsf/trunk/libc/sysdeps/s390/s390-32/dl-machine.h
fsf/trunk/libc/sysdeps/s390/s390-64/dl-machine.h
fsf/trunk/libc/sysdeps/sh/dl-machine.h
fsf/trunk/libc/sysdeps/sparc/sparc32/dl-machine.h
fsf/trunk/libc/sysdeps/sparc/sparc64/dl-machine.h
fsf/trunk/libc/sysdeps/unix/i386/sysdep.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/getpagesize.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/ia64/sysdep.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h
fsf/trunk/libc/sysdeps/unix/x86_64/sysdep.S
fsf/trunk/libc/sysdeps/x86_64/dl-machine.h
fsf/trunk/libc/tls.make.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Sep 11 00:48:32 2011
@@ -1,3 +1,145 @@
+2011-09-10 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ * malloc/malloc.c: Replace MALLOC_FAILURE_ACTION with use of __set_errno.
+ * malloc/hooks.c: Likewise.
+
+ * malloc/arena.c (ptmalloc_init_minimal): Removed. Initialize all
+ variables statically.
+ (narenas): Initialize.
+ (list_lock): Initialize.
+ (ptmalloc_init): Don't call ptmalloc_init_minimal. Remove initializtion
+ of main_arena and list_lock. Small cleanups.
+ Replace all uses of malloc_getpagesize with GLRO(dl_pagesize).
+ * malloc/malloc.c: Remove malloc_getpagesize. Include <ldsodefs.h>.
+ Add initializers to main_arena and mp_.
+ (malloc_state): Remove pagesize member. Change all users to use
+ GLRO(dl_pagesize).
+
+ * elf/rtld.c (rtld_global_ro): Initialize _dl_pagesize.
+ * sysdeps/unix/sysv/linux/getpagesize.c: Simplify. GLRO(dl_pagesize)
+ is always initialized.
+
+ * malloc/malloc.c: Removed unused configurations and dead code.
+ * malloc/arena.c: Likewise.
+ * malloc/hooks.c: Likewise.
+ * malloc/Makefile (CPPFLAGS-malloc.c): Don't add -DATOMIC_FASTBINS.
+
+ * include/tls.h: Removed. USE___THREAD must always be defined.
+ * bits/libc-tsd.h: Don't handle !USE___THREAD.
+ * elf/dl-libc.c: Likewise.
+ * elf/dl-tsd.c: Likewise.
+ * include/errno.h: Likewise.
+ * include/netdb.h: Likewise.
+ * include/resolv.h: Likewise.
+ * inet/herrno-loc.c: Likewise.
+ * inet/herrno.c: Likewise.
+ * malloc/arena.c: Likewise.
+ * malloc/hooks.c: Likewise.
+ * malloc/malloc.c: Likewise.
+ * resolv/res-state.c: Likewise.
+ * resolv/res_libc.c: Likewise.
+ * sysdeps/i386/dl-machine.h: Likewise.
+ * sysdeps/ia64/dl-machine.h: Likewise.
+ * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
+ * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
+ * sysdeps/s390/s390-32/dl-machine.h: Likewise.
+ * sysdeps/s390/s390-64/dl-machine.h: Likewise.
+ * sysdeps/sh/dl-machine.h: Likewise.
+ * sysdeps/sparc/sparc32/dl-machine.h: Likewise.
+ * sysdeps/sparc/sparc64/dl-machine.h: Likewise.
+ * sysdeps/unix/i386/sysdep.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
+ * sysdeps/unix/x86_64/sysdep.S: Likewise.
+ * sysdeps/x86_64/dl-machine.h: Likewise.
+ * tls.make.c: Likewise.
+
+ * 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@xxxxxxxxx>
* sysdeps/i386/fpu/libm-test-ulps: Adjust ULPs for jn tests.
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Sun Sep 11 00:48:32 2011
@@ -406,6 +406,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)
Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Sun Sep 11 00:48:32 2011
@@ -595,7 +595,6 @@
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 @@
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.
Modified: fsf/trunk/libc/Versions.def
==============================================================================
--- fsf/trunk/libc/Versions.def (original)
+++ fsf/trunk/libc/Versions.def Sun Sep 11 00:48:32 2011
@@ -32,9 +32,7 @@
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
Modified: fsf/trunk/libc/argp/argp-fmtstream.c
==============================================================================
--- fsf/trunk/libc/argp/argp-fmtstream.c (original)
+++ fsf/trunk/libc/argp/argp-fmtstream.c Sun Sep 11 00:48:32 2011
@@ -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@xxxxxxxxxxxxxx>.
@@ -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_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 @@
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 @@
*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
Modified: fsf/trunk/libc/argp/argp-fmtstream.h
==============================================================================
--- fsf/trunk/libc/argp/argp-fmtstream.h (original)
+++ fsf/trunk/libc/argp/argp-fmtstream.h Sun Sep 11 00:48:32 2011
@@ -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@xxxxxxxxxxxxxx>.
@@ -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
Modified: fsf/trunk/libc/argp/argp-help.c
==============================================================================
--- fsf/trunk/libc/argp/argp-help.c (original)
+++ fsf/trunk/libc/argp/argp-help.c Sun Sep 11 00:48:32 2011
@@ -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@xxxxxxxxxxxxxx>.
@@ -312,13 +311,13 @@
{"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 @@
#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)
Modified: fsf/trunk/libc/assert/assert.c
==============================================================================
--- fsf/trunk/libc/assert/assert.c (original)
+++ fsf/trunk/libc/assert/assert.c Sun Sep 11 00:48:32 2011
@@ -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
Modified: fsf/trunk/libc/bits/libc-tsd.h
==============================================================================
--- fsf/trunk/libc/bits/libc-tsd.h (original)
+++ fsf/trunk/libc/bits/libc-tsd.h Sun Sep 11 00:48:32 2011
@@ -1,5 +1,5 @@
/* libc-internal interface for thread-specific data. Stub or TLS version.
- Copyright (C) 1998,2001,2002,2008 Free Software Foundation, Inc.
+ Copyright (C) 1998,2001,2002,2008,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,12 +24,12 @@
set of thread-specific `void *' data used only internally by libc.
__libc_tsd_define(CLASS, TYPE, KEY) -- Define or declare a datum with TYPE
- for KEY. CLASS can be `static' for
+ for KEY. CLASS can be `static' for
keys used in only one source file,
empty for global definitions, or
`extern' for global declarations.
__libc_tsd_address(TYPE, KEY) -- Return the `TYPE *' pointing to
- the current thread's datum for KEY.
+ the current thread's datum for KEY.
__libc_tsd_get(TYPE, KEY) -- Return the `TYPE' datum for KEY.
__libc_tsd_set(TYPE, KEY, VALUE) -- Set the datum for KEY to VALUE.
@@ -51,20 +51,11 @@
We don't define an enum for the possible key values, because the KEYs
translate directly into variables by macro magic. */
-#if USE___THREAD
-# define __libc_tsd_define(CLASS, TYPE, KEY) \
+#define __libc_tsd_define(CLASS, TYPE, KEY) \
CLASS __thread TYPE __libc_tsd_##KEY attribute_tls_model_ie;
-# define __libc_tsd_address(TYPE, KEY) (&__libc_tsd_##KEY)
-# define __libc_tsd_get(TYPE, KEY) (__libc_tsd_##KEY)
-# define __libc_tsd_set(TYPE, KEY, VALUE) (__libc_tsd_##KEY = (VALUE))
-#else
-# define __libc_tsd_define(CLASS, TYPE, KEY) \
- CLASS TYPE __libc_tsd_##KEY##_data;
-
-# define __libc_tsd_address(TYPE, KEY) (&__libc_tsd_##KEY##_data)
-# define __libc_tsd_get(TYPE, KEY) (__libc_tsd_##KEY##_data)
-# define __libc_tsd_set(TYPE, KEY, VALUE) (__libc_tsd_##KEY##_data = (VALUE))
-#endif
+#define __libc_tsd_address(TYPE, KEY) (&__libc_tsd_##KEY)
+#define __libc_tsd_get(TYPE, KEY) (__libc_tsd_##KEY)
+#define __libc_tsd_set(TYPE, KEY, VALUE) (__libc_tsd_##KEY = (VALUE))
#endif /* bits/libc-tsd.h */
Modified: fsf/trunk/libc/config.h.in
==============================================================================
--- fsf/trunk/libc/config.h.in (original)
+++ fsf/trunk/libc/config.h.in Sun Sep 11 00:48:32 2011
@@ -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,21 +91,8 @@
/* 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). */
Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Sun Sep 11 00:48:32 2011
@@ -75,7 +75,6 @@
versioning = @VERSIONING@
oldest-abi = @oldest_abi@
-no-whole-archive = @no_whole_archive@
exceptions = @exceptions@
multi-arch = @multi_arch@
Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Sun Sep 11 00:48:32 2011
@@ -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 @@
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 @@
# 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 @@
LIBGD
libc_cv_cc_submachine
exceptions
-no_whole_archive
libc_cv_have_initfini
gnu89_inline
libc_cv_ssp
@@ -784,7 +775,6 @@
enable_stackguard_randomization
enable_add_ons
with_tls
-with___thread
enable_hidden_plt
enable_bind_now
enable_static_nss
@@ -870,9 +860,8 @@
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 @@
$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 @@
/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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
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 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 @@
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 @@
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 @@
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 @@
{ $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 @@
{ $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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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_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 @@
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 @@
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 @@
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 @@
# 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 @@
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 @@
# 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 @@
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 @@
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 @@
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 @@
{ $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_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
@@ -3676,15 +3664,6 @@
withval=$with_tls; usetls=$withval
else
usetls=yes
-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
@@ -4112,7 +4091,7 @@
# 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 "$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 @@
{ $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 @@
{ $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 @@
{ $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 @@
# 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 @@
{ $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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
*)
{ $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 @@
{ $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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
{ $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 @@
{ $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 @@
{ $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 @@
{ $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 @@
{ $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 @@
{ $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 @@
$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 @@
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 @@
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 @@
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 @@
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 @@
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 "$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 @@
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 "$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 "$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 "$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 "$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 "$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 "$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 @@
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:${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 "$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 "$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 @@
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 "$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 "$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 "$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 "$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 @@
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 @@
{ $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 "$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 @@
{ $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 "$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 @@
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 @@
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 @@
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 @@
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 @@
{ $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 @@
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 @@
{ $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 @@
{ $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 @@
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 @@
# 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 @@
{ $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 @@
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 @@
{ $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 @@
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
-
-fi
-
-if test "x$use__thread" != xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread" >&5
+if test "$libc_cv_gcc_builtin_redirection" = no; then
+ as_fn_error $? "support for the symbol redirection needed" "$LINENO" 5
+fi
+
+{ $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
-fi
-
-if test "$libc_cv_gcc___thread" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tls_model attribute" >&5
+if test "$libc_cv_gcc___thread" = no; then
+ as_fn_error $? "support for the __thread keyword is required" "$LINENO" 5
+fi
+
+{ $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 :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.c <<\EOF
+if test "${libc_cv_gcc_tls_model_attr+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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 @@
# 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 @@
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 @@
# 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 @@
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 @@
# 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 @@
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 @@
{ $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 "$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 "$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 @@
# 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 @@
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 @@
{ $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 @@
: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 @@
-: "${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 @@
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 @@
# 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 @@
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,14 +8595,9 @@
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=:
;;
*)
@@ -8672,7 +8621,6 @@
$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 @@
# 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 @@
{
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 @@
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -8843,7 +8789,7 @@
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 @@
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 @@
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 @@
# 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 @@
# 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 @@
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 @@
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&@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 @@
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
;;
Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Sun Sep 11 00:48:32 2011
@@ -193,12 +193,6 @@
[enable support for 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],
@@ -2078,10 +2072,9 @@
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
-fi
-AC_SUBST(no_whole_archive)dnl
+if test $libc_cv_ld_no_whole_archive = no; then
+ AC_MSG_ERROR([support for --no-whole-archive is needed])
+fi
AC_CACHE_CHECK(for gcc -fexceptions, libc_cv_gcc_exceptions, [dnl
cat > conftest.c <<\EOF
@@ -2133,8 +2126,8 @@
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 @@
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
-
-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
+rm -f conftest*])
+if test "$libc_cv_gcc___thread" = no; then
+ AC_MSG_ERROR([support for the __thread keyword is required])
+fi
+
+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 @@
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)
Modified: fsf/trunk/libc/csu/Versions
==============================================================================
--- fsf/trunk/libc/csu/Versions (original)
+++ fsf/trunk/libc/csu/Versions Sun Sep 11 00:48:32 2011
@@ -4,23 +4,12 @@
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
}
}
Modified: fsf/trunk/libc/csu/errno-loc.c
==============================================================================
--- fsf/trunk/libc/csu/errno-loc.c (original)
+++ fsf/trunk/libc/csu/errno-loc.c Sun Sep 11 00:48:32 2011
@@ -1,6 +1,6 @@
/* MT support function to get address of `errno' variable, non-threaded
version.
- Copyright (C) 1996, 1998, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998, 2002, 2004, 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,15 +21,7 @@
#include <errno.h>
#include <tls.h>
-#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO
-#undef errno
-extern int errno;
-#endif
-
int *
-#if ! USE___THREAD
-weak_const_function
-#endif
__errno_location (void)
{
return &errno;
Modified: fsf/trunk/libc/csu/errno.c
==============================================================================
--- fsf/trunk/libc/csu/errno.c (original)
+++ fsf/trunk/libc/csu/errno.c Sun Sep 11 00:48:32 2011
@@ -1,5 +1,5 @@
/* Definition of `errno' variable. Canonical version.
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 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
@@ -27,27 +27,10 @@
/* Code compiled for rtld refers only to this name. */
int rtld_errno attribute_hidden;
-#elif USE___THREAD
+#else
__thread int errno;
extern __thread int __libc_errno __attribute__ ((alias ("errno")))
attribute_hidden;
-#else
-
-/* This differs from plain `int errno;' in that it doesn't create
- a common definition, but a plain symbol that resides in .bss,
- which can have an alias. */
-int errno __attribute__ ((nocommon));
-strong_alias (errno, _errno)
-
-/* We declare these with compat_symbol so that they are not visible at
- link time. Programs must use the accessor functions. RTLD is special,
- since it's not exported from there at any time. */
-# if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
-# include <shlib-compat.h>
-compat_symbol (libc, errno, errno, GLIBC_2_0);
-compat_symbol (libc, _errno, _errno, GLIBC_2_0);
-# endif
-
#endif
Modified: fsf/trunk/libc/csu/init.c
==============================================================================
--- fsf/trunk/libc/csu/init.c (original)
+++ fsf/trunk/libc/csu/init.c Sun Sep 11 00:48:32 2011
@@ -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>
Modified: fsf/trunk/libc/elf/dl-libc.c
==============================================================================
--- fsf/trunk/libc/elf/dl-libc.c (original)
+++ fsf/trunk/libc/elf/dl-libc.c Sun Sep 11 00:48:32 2011
@@ -307,22 +307,19 @@
}
}
- if (USE___THREAD || GL(dl_tls_dtv_slotinfo_list) != NULL)
- {
- /* Free the memory allocated for the dtv slotinfo array. We can do
- this only if all modules which used this memory are unloaded. */
-#ifdef SHARED
- if (GL(dl_initial_dtv) == NULL)
- /* There was no initial TLS setup, it was set up later when
- it used the normal malloc. */
- free_slotinfo (&GL(dl_tls_dtv_slotinfo_list));
- else
-#endif
- /* The first element of the list does not have to be deallocated.
- It was allocated in the dynamic linker (i.e., with a different
- malloc), and in the static library it's in .bss space. */
- free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next);
- }
+ /* Free the memory allocated for the dtv slotinfo array. We can do
+ this only if all modules which used this memory are unloaded. */
+#ifdef SHARED
+ if (GL(dl_initial_dtv) == NULL)
+ /* There was no initial TLS setup, it was set up later when
+ it used the normal malloc. */
+ free_slotinfo (&GL(dl_tls_dtv_slotinfo_list));
+ else
+#endif
+ /* The first element of the list does not have to be deallocated.
+ It was allocated in the dynamic linker (i.e., with a different
+ malloc), and in the static library it's in .bss space. */
+ free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next);
void *scope_free_list = GL(dl_scope_free_list);
GL(dl_scope_free_list) = NULL;
Modified: fsf/trunk/libc/elf/dl-tsd.c
==============================================================================
--- fsf/trunk/libc/elf/dl-tsd.c (original)
+++ fsf/trunk/libc/elf/dl-tsd.c Sun Sep 11 00:48:32 2011
@@ -1,5 +1,5 @@
/* Thread-local data used by error handling for runtime dynamic linker.
- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 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
@@ -30,17 +30,13 @@
void ** __attribute__ ((const))
_dl_initial_error_catch_tsd (void)
{
-# if USE___THREAD
static __thread void *data;
-# else
- static void *data;
-# endif
return &data;
}
void **(*_dl_error_catch_tsd) (void) __attribute__ ((const))
= &_dl_initial_error_catch_tsd;
-# elif USE___THREAD
+# else
/* libpthread sets _dl_error_catch_tsd to point to this function.
We define it here instead of in libpthread so that it doesn't
Modified: fsf/trunk/libc/elf/rtld.c
==============================================================================
--- fsf/trunk/libc/elf/rtld.c (original)
+++ fsf/trunk/libc/elf/rtld.c Sun Sep 11 00:48:32 2011
@@ -161,6 +161,7 @@
._dl_lazy = 1,
._dl_fpu_control = _FPU_DEFAULT,
._dl_pointer_guard = 1,
+ ._dl_pagesize = EXEC_PAGESIZE,
/* Function pointers. */
._dl_debug_printf = _dl_debug_printf,
Modified: fsf/trunk/libc/elf/tst-audit2.c
==============================================================================
--- fsf/trunk/libc/elf/tst-audit2.c (original)
+++ fsf/trunk/libc/elf/tst-audit2.c Sun Sep 11 00:48:32 2011
@@ -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 @@
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 @@
}
magic[0] = MAGIC2;
magic[1] = MAGIC1;
-#endif
n *= m;
void *ptr = malloc (n);
@@ -38,13 +34,11 @@
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;
}
Modified: fsf/trunk/libc/elf/tst-tls10.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tls10.c (original)
+++ fsf/trunk/libc/elf/tst-tls10.c Sun Sep 11 00:48:32 2011
@@ -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 @@
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 @@
abort ();
CHECK (9, 28);
CHECK (10, 31);
-#endif
+
exit (0);
}
Modified: fsf/trunk/libc/elf/tst-tls10.h
==============================================================================
--- fsf/trunk/libc/elf/tst-tls10.h (original)
+++ fsf/trunk/libc/elf/tst-tls10.h Sun Sep 11 00:48:32 2011
@@ -1,8 +1,5 @@
#include <tls.h>
#include <stdlib.h>
-
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
-# define USE_TLS__THREAD
struct A
{
@@ -34,4 +31,3 @@
extern int f10b (void);
extern void check1 (void);
extern void check2 (void);
-#endif
Modified: fsf/trunk/libc/elf/tst-tls11.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tls11.c (original)
+++ fsf/trunk/libc/elf/tst-tls11.c Sun Sep 11 00:48:32 2011
@@ -8,7 +8,6 @@
int
main (void)
{
-#ifdef USE_TLS__THREAD
struct A *p;
check1 ();
check2 ();
@@ -22,6 +21,6 @@
CHECK (8, 25);
CHECK (9, 28);
CHECK (10, 31);
-#endif
+
exit (0);
}
Modified: fsf/trunk/libc/elf/tst-tls12.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tls12.c (original)
+++ fsf/trunk/libc/elf/tst-tls12.c Sun Sep 11 00:48:32 2011
@@ -8,11 +8,10 @@
int
main (void)
{
-#ifdef USE_TLS__THREAD
struct A *p;
check1 ();
CHECK (1, 4);
CHECK (2, 7);
-#endif
+
exit (0);
}
Modified: fsf/trunk/libc/elf/tst-tls14.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tls14.c (original)
+++ fsf/trunk/libc/elf/tst-tls14.c Sun Sep 11 00:48:32 2011
@@ -6,9 +6,7 @@
#include <tls.h>
-#if HAVE___THREAD
-
-# define AL 4096
+#define AL 4096
struct foo
{
int i;
@@ -55,12 +53,5 @@
return result;
}
-# define TEST_FUNCTION do_test ()
-
-#else
-
-# define TEST_FUNCTION 0
-
-#endif
-
+#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"
Modified: fsf/trunk/libc/elf/tst-tlsmod11.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod11.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod11.c Sun Sep 11 00:48:32 2011
@@ -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
Modified: fsf/trunk/libc/elf/tst-tlsmod12.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod12.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod12.c Sun Sep 11 00:48:32 2011
@@ -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 @@
if (a2.a != 7 || a2.b != 8 || a2.c != 9)
abort ();
}
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod13.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod13.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod13.c Sun Sep 11 00:48:32 2011
@@ -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)
Modified: fsf/trunk/libc/elf/tst-tlsmod13a.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod13a.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod13a.c Sun Sep 11 00:48:32 2011
@@ -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);
Modified: fsf/trunk/libc/elf/tst-tlsmod14a.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod14a.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod14a.c Sun Sep 11 00:48:32 2011
@@ -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 struct foo g;
-# ifndef FCT
-# define FCT in_dso1
-# endif
+#ifndef FCT
+# define FCT in_dso1
+#endif
int
@@ -37,5 +35,3 @@
return result;
}
-
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod15b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod15b.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod15b.c Sun Sep 11 00:48:32 2011
@@ -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 @@
{
return mod15b_var;
}
-#else
-int
-in_dso (void)
-{
- return 0;
-}
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod16a.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod16a.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod16a.c Sun Sep 11 00:48:32 2011
@@ -1,7 +1,3 @@
#include <tls.h>
-#if defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE
int __thread tlsvar;
-#else
-int tlsvar;
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod16b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod16b.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod16b.c Sun Sep 11 00:48:32 2011
@@ -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)
Modified: fsf/trunk/libc/elf/tst-tlsmod7.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod7.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod7.c Sun Sep 11 00:48:32 2011
@@ -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 @@
{
return local2.c;
}
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod8.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod8.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod8.c Sun Sep 11 00:48:32 2011
@@ -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 @@
{
return local2.c;
}
-#endif
Modified: fsf/trunk/libc/elf/tst-tlsmod9.c
==============================================================================
--- fsf/trunk/libc/elf/tst-tlsmod9.c (original)
+++ fsf/trunk/libc/elf/tst-tlsmod9.c Sun Sep 11 00:48:32 2011
@@ -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 @@
{
return local2.c;
}
-#endif
Modified: fsf/trunk/libc/gmon/gmon.c
==============================================================================
--- fsf/trunk/libc/gmon/gmon.c (original)
+++ fsf/trunk/libc/gmon/gmon.c Sun Sep 11 00:48:32 2011
@@ -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 @@
char dimen_abbrev;
} thdr;
struct iovec iov[3] =
- {
+ {
{ &tag, sizeof (tag) },
{ &thdr, sizeof (struct gmon_hist_hdr) },
{ _gmonparam.kcount, _gmonparam.kcountsize }
Modified: fsf/trunk/libc/grp/fgetgrent_r.c
==============================================================================
--- fsf/trunk/libc/grp/fgetgrent_r.c (original)
+++ fsf/trunk/libc/grp/fgetgrent_r.c Sun Sep 11 00:48:32 2011
@@ -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. */
Modified: fsf/trunk/libc/grp/putgrent.c
==============================================================================
--- fsf/trunk/libc/grp/putgrent.c (original)
+++ fsf/trunk/libc/grp/putgrent.c Sun Sep 11 00:48:32 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,96,98,99,2000,2005 Free Software Foundation, Inc.
[... 8272 lines stripped ...]