GNU C Library master sources branch, master, updated. glibc-2.12-262-g1f20b93

drepper@sourceware.org drepper@sourceware.org
Mon Jan 17 02:32:00 GMT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  1f20b93a6c695ba97a6a334f91b9369185e4e859 (commit)
       via  77e8bddff3fe1395d73515edfbfaa4441f8aa1cb (commit)
      from  bc425b339b067bebe3d49907e63b0e81eb261bd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1f20b93a6c695ba97a6a334f91b9369185e4e859

commit 1f20b93a6c695ba97a6a334f91b9369185e4e859
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Sun Jan 16 21:32:07 2011 -0500

    Fix missing dependencies and ensure correct CPPFLAGS.

diff --git a/ChangeLog b/ChangeLog
index ad143eb..834e164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-16  Andreas Schwab  <schwab@linux-m68k.org>
 
+	* elf/Makefile (tlsmod17a-modules, tlsmod18a-modules): Define.
+	(modules-names): Use them.
+	(ifunc-test-modules, ifunc-pie-tests): Define.
+	(extra-test-objs): Add tlsmod17a-modules, tlsmod18a-modules,
+	tst-pie1, ifunc-test-modules and ifunc-pie-tests objects.
+	(test-extras): Likewise.
+	($(patsubst %,$(objpfx)%.os,$(tlsmod17a-modules))): Use
+	$(compile-command.c).
+	($(patsubst %,$(objpfx)%.os,$(tlsmod18a-modules))): Likewise.
+	(all-built-dso): Define.
+	(check-textrel.out, check-execstack.out): Depend on it.
+
 	* configure.in: Don't override --enable-multi-arch.
 
 2011-01-15  Ulrich Drepper  <drepper@gmail.com>
diff --git a/elf/Makefile b/elf/Makefile
index da9af8b..2d2d568 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -212,6 +212,10 @@ endif
 tests: $(objpfx)tst-leaks1-mem
 tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+tlsmod17a-modules = $(addprefix tst-tlsmod17a, $(tlsmod17a-suffixes))
+tlsmod18a-modules = $(addprefix tst-tlsmod18a, $(tlsmod17a-suffixes))
+extra-test-objs += $(tlsmod17a-modules:=.os) $(tlsmod18a-modules:=.os)
+test-extras += tst-tlsmod17a tst-tlsmod18a
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \
 		dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \
@@ -231,9 +235,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		tst-tlsmod9 tst-tlsmod10 tst-tlsmod11 tst-tlsmod12 \
 		tst-tlsmod13 tst-tlsmod13a tst-tlsmod14a tst-tlsmod14b \
 		tst-tlsmod15a tst-tlsmod15b tst-tlsmod16a tst-tlsmod16b \
-		$(patsubst %,tst-tlsmod17a%,$(tlsmod17a-suffixes)) \
-		tst-tlsmod17b \
-		$(patsubst %,tst-tlsmod18a%,$(tlsmod18a-suffixes)) \
+		$(tlsmod17a-modules) tst-tlsmod17b $(tlsmod18a-modules) \
 		circlemod1 circlemod1a circlemod2 circlemod2a \
 		circlemod3 circlemod3a \
 		reldep8mod1 reldep8mod2 reldep8mod3 \
@@ -254,6 +256,8 @@ modules-names += tst-array2dep tst-array5dep
 endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
+extra-test-objs += tst-pie1.o
+test-extras += tst-pie1
 endif
 ifeq (x86_64,$(config-machine))
 modules-names += tst-auditmod3a tst-auditmod3b \
@@ -283,10 +287,16 @@ tests += ifuncmain1 ifuncmain1pic ifuncmain1vis ifuncmain1vispic \
 	 ifuncmain2 ifuncmain2pic ifuncmain3 ifuncmain4 \
 	 ifuncmain5 ifuncmain5pic ifuncmain5staticpic \
 	 ifuncmain7 ifuncmain7pic
+ifunc-test-modules = ifuncdep1 ifuncdep1pic ifuncdep2 ifuncdep2pic \
+		     ifuncdep5 ifuncdep5pic
+extra-test-objs += $(ifunc-test-modules:=.o)
+test-extras += $(ifunc-test-modules)
 ifeq (yes,$(have-fpie))
-tests: $(objpfx)ifuncmain1pie.out $(objpfx)ifuncmain1vispie.out \
-	$(objpfx)ifuncmain1staticpie.out $(objpfx)ifuncmain5pie.out \
-	$(objpfx)ifuncmain6pie.out $(objpfx)ifuncmain7pie.out
+ifunc-pie-tests = ifuncmain1pie ifuncmain1vispie ifuncmain1staticpie \
+		  ifuncmain5pie ifuncmain6pie ifuncmain7pie
+tests: $(patsubst %,$(objpfx)%.out, $(ifunc-pie-tests))
+extra-test-objs += $(ifunc-pie-tests:=.o)
+test-extras += $(ifunc-pie-tests)
 endif
 modules-names += ifuncmod1 ifuncmod3 ifuncmod5 ifuncmod6
 endif
@@ -784,16 +794,16 @@ $(objpfx)tst-tls16.out: $(objpfx)tst-tlsmod16a.so $(objpfx)tst-tlsmod16b.so
 
 $(objpfx)tst-tls17: $(libdl)
 $(objpfx)tst-tls17.out: $(objpfx)tst-tlsmod17b.so
-$(patsubst %,$(objpfx)tst-tlsmod17a%.os,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.os : tst-tlsmod17a.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $<
-$(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so
-$(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes))
+$(patsubst %,$(objpfx)%.os,$(tlsmod17a-modules)): $(objpfx)tst-tlsmod17a%.os: tst-tlsmod17a.c
+	$(compile-command.c) -DN=$*
+$(patsubst %,$(objpfx)%.so,$(tlsmod17a-modules)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so
+$(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)%.so,$(tlsmod17a-modules))
 
 $(objpfx)tst-tls18: $(libdl)
-$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes))
-$(patsubst %,$(objpfx)tst-tlsmod18a%.os,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $<
-$(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so
+$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)%.so,$(tlsmod18a-modules))
+$(patsubst %,$(objpfx)%.os,$(tlsmod18a-modules)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c
+	$(compile-command.c) -DN=$*
+$(patsubst %,$(objpfx)%.so,$(tlsmod18a-modules)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so
 
 CFLAGS-tst-align.c = $(stack-align-test-flags)
 CFLAGS-tst-align2.c = $(stack-align-test-flags)
@@ -917,16 +927,16 @@ $(objpfx)check-localplt: check-localplt.c
 ifeq (yes,$(build-shared))
 tests: $(objpfx)check-textrel.out $(objpfx)check-execstack.out
 
-$(objpfx)check-textrel.out: $(objpfx)check-textrel
-	$(dir $<)$(notdir $<) $(common-objpfx)libc.so \
-	  $(sort $(wildcard $(common-objpfx)*/lib*.so \
-			    $(common-objpfx)iconvdata/*.so)) > $@
+all-built-dso = $(common-objpfx)libc.so \
+		$(sort $(wildcard $(common-objpfx)*/lib*.so \
+				  $(common-objpfx)iconvdata/*.so))
+
+$(objpfx)check-textrel.out: $(objpfx)check-textrel $(all-built-dso)
+	$(dir $<)$(notdir $<) $(filter-out $<, $^) > $@
 generated += check-textrel check-textrel.out
 
-$(objpfx)check-execstack.out: $(objpfx)check-execstack
-	$(dir $<)$(notdir $<) $(common-objpfx)libc.so \
-	  $(sort $(wildcard $(common-objpfx)*/lib*.so \
-			    $(common-objpfx)iconvdata/*.so)) > $@
+$(objpfx)check-execstack.out: $(objpfx)check-execstack $(all-built-dso)
+	$(dir $<)$(notdir $<) $(filter-out $<, $^) > $@
 generated += check-execstack check-execstack.out
 
 $(objpfx)tst-dlmodcount: $(libdl)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f3a2753..fd961d6 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile (test-extras): Add tst-cleanup4aux.
+
 2011-01-14  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #10563]
diff --git a/nptl/Makefile b/nptl/Makefile
index 51b6ae5..266f178 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -300,7 +300,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
 		tst-tls5modd tst-tls5mode tst-tls5modf \
 		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
-test-extras += $(modules-names)
+test-extras += $(modules-names) tst-cleanup4aux
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 
 tst-atfork2mod.so-no-z-defs = yes

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=77e8bddff3fe1395d73515edfbfaa4441f8aa1cb

commit 77e8bddff3fe1395d73515edfbfaa4441f8aa1cb
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Sun Jan 16 21:29:41 2011 -0500

    Don't override --enable-multi-arch.

diff --git a/ChangeLog b/ChangeLog
index b55aaac..ad143eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* configure.in: Don't override --enable-multi-arch.
+
 2011-01-15  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #6812]
diff --git a/configure b/configure
index 823f15e..999a448 100755
--- a/configure
+++ b/configure
@@ -3951,7 +3951,7 @@ if test x"$add_ons" != x; then
       ;;
     *)
       test -d "$srcdir/$libc_add_on" || {
-        if test -d "$libc_add_on"; then
+	if test -d "$libc_add_on"; then
 	  libc_add_on="`pwd`/$libc_add_on"
 	else
 	  as_fn_error $? "add-on directory \"$libc_add_on\" does not exist" "$LINENO" 5
@@ -3971,7 +3971,7 @@ $as_echo "$as_me: running configure fragment for add-on $libc_add_on" >&6;}
       libc_add_on_subdirs=
       . "$libc_add_on_frag"
       test -z "$libc_add_on" || {
-        configured_add_ons="$configured_add_ons $libc_add_on"
+	configured_add_ons="$configured_add_ons $libc_add_on"
 	if test "x$libc_add_on_canonical" = xunknown; then
 	  as_fn_error $? "fragment must set \$libc_add_on_canonical" "$LINENO" 5
 	fi
@@ -4320,8 +4320,8 @@ for b in $base ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
 	      if test -n "$m0$m0sub$b$v$o$m$msub"; then
-	        try_srcdir="${srcdir}/"
-	        case "$d" in
+		try_srcdir="${srcdir}/"
+		case "$d" in
 		/*) try_srcdir= ;;
 		esac
 		try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
@@ -4356,7 +4356,7 @@ case $sysnames_add_ons$sysnames in
 *"$multi_arch_d"*)
   ;;
 *)
-  multi_arch=no
+  test x"$multi_arch" = xdefault && multi_arch=no
   ;;
 esac
 if test x"$multi_arch" != xno; then
@@ -4451,7 +4451,7 @@ while test $# -gt 0; do
 	fi
       done
       if test $found = no; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/Implies specifies nonexistent $x" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $name/Implies specifies nonexistent $x" >&5
 $as_echo "$as_me: WARNING: $name/Implies specifies nonexistent $x" >&2;}
       fi
     done
@@ -4528,7 +4528,7 @@ $as_echo "$as_me: WARNING: add-on $add_on contributed no sysdeps directories" >&
 	 done
 	 ;;
        *)
-         test -d "$f" || { test -e "$f" && exit 88; }
+	 test -d "$f" || { test -e "$f" && exit 88; }
 	 ;;
        esac
      done)
@@ -5937,7 +5937,7 @@ VERS_1 {
 };
 
 VERS_2 {
-        global: sym;
+	global: sym;
 } VERS_1;
 EOF
   if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5; then
@@ -6367,7 +6367,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_relro" >&5
 $as_echo "$libc_cv_z_relro" >&6; }
       if test "$libc_cv_z_relro" = no; then
-        as_fn_error $? "linker with -z relro support required" "$LINENO" 5
+	as_fn_error $? "linker with -z relro support required" "$LINENO" 5
       fi
       ;;
     *) ;;
@@ -6918,13 +6918,13 @@ else
   *) cfi_offset=0;;
 esac
 cat > conftest.s <<EOF
-        .text
-        .type   func,%function
+	.text
+	.type   func,%function
 func:
-        .cfi_startproc
+	.cfi_startproc
 	.cfi_remember_state
 	.cfi_rel_offset 1, $cfi_offset
-        .cfi_endproc
+	.cfi_endproc
 EOF
 if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
diff --git a/configure.in b/configure.in
index ad25b9b..668dbd1 100644
--- a/configure.in
+++ b/configure.in
@@ -29,8 +29,8 @@ config_vars=
 
 # Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
 AC_ARG_WITH([gd],
-            AC_HELP_STRING([--with-gd=DIR],
-                           [find libgd include dir and library with prefix DIR]),
+	    AC_HELP_STRING([--with-gd=DIR],
+			   [find libgd include dir and library with prefix DIR]),
 	    [dnl
 case "$with_gd" in
 yes|''|no) ;;
@@ -39,18 +39,18 @@ yes|''|no) ;;
 esac
 ])
 AC_ARG_WITH([gd-include],
-            AC_HELP_STRING([--with-gd-include=DIR],
-                           [find libgd include files in DIR]),
-            [dnl
+	    AC_HELP_STRING([--with-gd-include=DIR],
+			   [find libgd include files in DIR]),
+	    [dnl
 case "$with_gd_include" in
 ''|no) ;;
 *) libgd_include="-I$withval" ;;
 esac
 ])
 AC_ARG_WITH([gd-lib],
-            AC_HELP_STRING([--with-gd-lib=DIR],
-                           [find libgd library files in DIR]),
-            [dnl
+	    AC_HELP_STRING([--with-gd-lib=DIR],
+			   [find libgd library files in DIR]),
+	    [dnl
 case "$with_gd_lib" in
 ''|no) ;;
 *) libgd_ldflags="-L$withval" ;;
@@ -68,34 +68,34 @@ fi
 
 dnl Arguments to specify presence of other packages/features.
 AC_ARG_WITH([fp],
-            AC_HELP_STRING([--with-fp],
-                           [if using floating-point hardware @<:@default=yes@:>@]),
+	    AC_HELP_STRING([--with-fp],
+			   [if using floating-point hardware @<:@default=yes@:>@]),
 	    [with_fp=$withval],
 	    [with_fp=yes])
 AC_SUBST(with_fp)
 AC_ARG_WITH([binutils],
-            AC_HELP_STRING([--with-binutils=PATH],
-                           [specify location of binutils (as and ld)]),
+	    AC_HELP_STRING([--with-binutils=PATH],
+			   [specify location of binutils (as and ld)]),
 	    [path_binutils=$withval],
 	    [path_binutils=''])
 AC_ARG_WITH([elf],
-            AC_HELP_STRING([--with-elf],
-                           [if using the ELF object format]),
+	    AC_HELP_STRING([--with-elf],
+			   [if using the ELF object format]),
 	    [elf=$withval],
 	    [elf=no])
 AC_ARG_WITH([selinux],
-            AC_HELP_STRING([--with-selinux],
-                           [if building with SELinux support]),
+	    AC_HELP_STRING([--with-selinux],
+			   [if building with SELinux support]),
 	    [with_selinux=$withval],
 	    [with_selinux=auto])
 AC_ARG_WITH([xcoff],
-            AC_HELP_STRING([--with-xcoff],
-                           [if using the XCOFF object format]),
+	    AC_HELP_STRING([--with-xcoff],
+			   [if using the XCOFF object format]),
 	    [xcoff=$withval],
 	    [xcoff=no])
 AC_ARG_WITH([cvs],
-            AC_HELP_STRING([--without-cvs],
-                           [if CVS should not be used]),
+	    AC_HELP_STRING([--without-cvs],
+			   [if CVS should not be used]),
 	    [with_cvs=$withval],
 	    [with_cvs=yes])
 if test "$with_cvs" = yes; then
@@ -107,16 +107,16 @@ fi
 AC_SUBST(with_cvs)
 
 AC_ARG_WITH([headers],
-            AC_HELP_STRING([--with-headers=PATH],
-	                   [location of system headers to use
+	    AC_HELP_STRING([--with-headers=PATH],
+			   [location of system headers to use
 			    (for example /usr/src/linux/include)
 			    @<:@default=compiler default@:>@]),
 	    [sysheaders=$withval],
 	    [sysheaders=''])
 
 AC_ARG_ENABLE([sanity-checks],
-              AC_HELP_STRING([--disable-sanity-checks],
-                             [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
+	      AC_HELP_STRING([--disable-sanity-checks],
+			     [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
 	      [enable_sanity=$enableval],
 	      [enable_sanity=yes])
 
@@ -139,34 +139,34 @@ dnl               [static=$enableval],
 dnl               [static=yes])
 static=yes
 AC_ARG_ENABLE([shared],
-              AC_HELP_STRING([--enable-shared],
-                             [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
+	      AC_HELP_STRING([--enable-shared],
+			     [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
 	      [shared=$enableval],
 	      [shared=default])
 AC_ARG_ENABLE([profile],
-              AC_HELP_STRING([--enable-profile],
-                             [build profiled library @<:@default=no@:>@]),
+	      AC_HELP_STRING([--enable-profile],
+			     [build profiled library @<:@default=no@:>@]),
 	      [profile=$enableval],
 	      [profile=no])
 AC_ARG_ENABLE([omitfp],
-              AC_HELP_STRING([--enable-omitfp],
-                             [build undebuggable optimized library @<:@default=no@:>@]),
+	      AC_HELP_STRING([--enable-omitfp],
+			     [build undebuggable optimized library @<:@default=no@:>@]),
 	      [omitfp=$enableval],
 	      [omitfp=no])
 AC_ARG_ENABLE([bounded],
-              AC_HELP_STRING([--enable-bounded],
-                             [build with runtime bounds checking @<:@default=no@:>@]),
+	      AC_HELP_STRING([--enable-bounded],
+			     [build with runtime bounds checking @<:@default=no@:>@]),
 	      [bounded=$enableval],
 	      [bounded=no])
 AC_ARG_ENABLE([versioning],
-              AC_HELP_STRING([--disable-versioning],
-                             [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
+	      AC_HELP_STRING([--disable-versioning],
+			     [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
 	      [enable_versioning=$enableval],
 	      [enable_versioning=yes])
 
 AC_ARG_ENABLE([oldest-abi],
-              AC_HELP_STRING([--enable-oldest-abi=ABI],
-                             [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
+	      AC_HELP_STRING([--enable-oldest-abi=ABI],
+			     [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
 	      [oldest_abi=$enableval],
 	      [oldest_abi=no])
 if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
@@ -187,27 +187,27 @@ fi
 
 dnl Generic infrastructure for drop-in additions to libc.
 AC_ARG_ENABLE([add-ons],
-              AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
-                             [configure and build add-ons in DIR1,DIR2,...
-                              search for add-ons if no parameter given]),
+	      AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
+			     [configure and build add-ons in DIR1,DIR2,...
+			      search for add-ons if no parameter given]),
 			     , [enable_add_ons=yes])
 
 dnl Let the user avoid using TLS.  Don't know why but...
 AC_ARG_WITH([tls],
-            AC_HELP_STRING([--with-tls],
-                           [enable support for TLS]),
+	    AC_HELP_STRING([--with-tls],
+			   [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]),
+	    AC_HELP_STRING([--without-__thread],
+			   [do not use TLS features even when supporting them]),
 	    [use__thread=$withval],
 	    [use__thread=yes])
 
 AC_ARG_ENABLE([hidden-plt],
-              AC_HELP_STRING([--disable-hidden-plt],
-                             [do not hide internal function calls to avoid PLT]),
+	      AC_HELP_STRING([--disable-hidden-plt],
+			     [do not hide internal function calls to avoid PLT]),
 	      [hidden=$enableval],
 	      [hidden=yes])
 if test "x$hidden" = xno; then
@@ -224,8 +224,8 @@ AC_SUBST(bindnow)
 dnl On some platforms we cannot use dynamic loading.  We must provide
 dnl static NSS modules.
 AC_ARG_ENABLE([static-nss],
-              AC_HELP_STRING([--enable-static-nss],
-                             [build static NSS modules @<:@default=no@:>@]),
+	      AC_HELP_STRING([--enable-static-nss],
+			     [build static NSS modules @<:@default=no@:>@]),
 	      [static_nss=$enableval],
 	      [static_nss=no])
 dnl Enable static NSS also if we build no shared objects.
@@ -235,8 +235,8 @@ if test x"$static_nss" = xyes || test x"$shared" = xno; then
 fi
 
 AC_ARG_ENABLE([force-install],
-              AC_HELP_STRING([--disable-force-install],
-                             [don't force installation of files from this package, even if they are older than the installed files]),
+	      AC_HELP_STRING([--disable-force-install],
+			     [don't force installation of files from this package, even if they are older than the installed files]),
 	      [force_install=$enableval],
 	      [force_install=yes])
 AC_SUBST(force_install)
@@ -244,8 +244,8 @@ AC_SUBST(force_install)
 dnl On some platforms we allow dropping compatibility with all kernel
 dnl versions.
 AC_ARG_ENABLE([kernel],
-              AC_HELP_STRING([--enable-kernel=VERSION],
-                             [compile for compatibility with kernel not older than VERSION]),
+	      AC_HELP_STRING([--enable-kernel=VERSION],
+			     [compile for compatibility with kernel not older than VERSION]),
 	      [minimum_kernel=$enableval],
 	      [])
 dnl Prevent unreasonable values.
@@ -263,7 +263,7 @@ dnl This is not the default since many of the extra warnings are not
 dnl appropriate.
 AC_ARG_ENABLE([all-warnings],
 	      AC_HELP_STRING([--enable-all-warnings],
-                             [enable all useful warnings gcc can issue]),
+			     [enable all useful warnings gcc can issue]),
 	      [all_warnings=$enableval],
 	      [])
 AC_SUBST(all_warnings)
@@ -444,7 +444,7 @@ if test x"$add_ons" != x; then
       ;;
     *)
       test -d "$srcdir/$libc_add_on" || {
-        if test -d "$libc_add_on"; then
+	if test -d "$libc_add_on"; then
 	  libc_add_on="`pwd`/$libc_add_on"
 	else
 	  AC_MSG_ERROR(add-on directory \"$libc_add_on\" does not exist)
@@ -463,7 +463,7 @@ if test x"$add_ons" != x; then
       libc_add_on_subdirs=
       . "$libc_add_on_frag"
       test -z "$libc_add_on" || {
-        configured_add_ons="$configured_add_ons $libc_add_on"
+	configured_add_ons="$configured_add_ons $libc_add_on"
 	if test "x$libc_add_on_canonical" = xunknown; then
 	  AC_MSG_ERROR(fragment must set \$libc_add_on_canonical)
 	fi
@@ -602,7 +602,7 @@ fi
 
 # For the multi-arch option we need support in the assembler.
 AC_CACHE_CHECK([for assembler gnu_indirect_function symbol type support],
-               libc_cv_asm_gnu_indirect_function, [dnl
+	       libc_cv_asm_gnu_indirect_function, [dnl
 cat > conftest.s <<EOF
 .type foo,%gnu_indirect_function
 EOF
@@ -771,8 +771,8 @@ for b in $base ''; do
 	  for d in $add_ons_pfx ''; do
 	    for a in $add_ons_sfx ''; do
 	      if test -n "$m0$m0sub$b$v$o$m$msub"; then
-	        try_srcdir="${srcdir}/"
-	        case "$d" in
+		try_srcdir="${srcdir}/"
+		case "$d" in
 		/*) try_srcdir= ;;
 		esac
 		try="${d}sysdeps$m0$m0sub$b$v$o$m$msub$a"
@@ -807,7 +807,7 @@ case $sysnames_add_ons$sysnames in
 *"$multi_arch_d"*)
   ;;
 *)
-  multi_arch=no
+  test x"$multi_arch" = xdefault && multi_arch=no
   ;;
 esac
 if test x"$multi_arch" != xno; then
@@ -901,7 +901,7 @@ while test $# -gt 0; do
 	fi
       done
       if test $found = no; then
-        AC_MSG_WARN($name/Implies specifies nonexistent $x)
+	AC_MSG_WARN($name/Implies specifies nonexistent $x)
       fi
     done
   else
@@ -977,7 +977,7 @@ for add_on in $add_ons; do
 	 done
 	 ;;
        *)
-         test -d "$f" || { test -e "$f" && exit 88; }
+	 test -d "$f" || { test -e "$f" && exit 88; }
 	 ;;
        esac
      done)
@@ -1214,8 +1214,8 @@ AC_TRY_COMPILE(dnl
 #error stddef.h ignored __need_*
 #endif
 if (&size == NULL || &wchar == NULL) abort ();],
-               libc_cv_friendly_stddef=yes,
-               libc_cv_friendly_stddef=no)])
+	       libc_cv_friendly_stddef=yes,
+	       libc_cv_friendly_stddef=no)])
 if test $libc_cv_friendly_stddef = yes; then
   config_vars="$config_vars
 override stddef.h = # The installed <stddef.h> seems to be libc-friendly."
@@ -1305,7 +1305,7 @@ VERS_1 {
 };
 
 VERS_2 {
-        global: sym;
+	global: sym;
 } VERS_1;
 EOF
   if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
@@ -1581,7 +1581,7 @@ changequote([,])dnl
     fi
   fi])
       if test "$libc_cv_z_relro" = no; then
-        AC_MSG_ERROR(linker with -z relro support required)
+	AC_MSG_ERROR(linker with -z relro support required)
       fi
       ;;
     *) ;;
@@ -1863,12 +1863,12 @@ else
   if test $ac_cv_prog_cc_works = yes; then
     AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
 		   [AC_TRY_LINK([asm ("_glibc_foobar:");], [glibc_foobar ();],
-			        libc_cv_asm_underscores=yes,
-			        libc_cv_asm_underscores=no)])
+				libc_cv_asm_underscores=yes,
+				libc_cv_asm_underscores=no)])
   else
     AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
 		   [AC_CHECK_ASM_UNDERSCORE(libc_cv_asm_underscores=yes,
-				            libc_cv_asm_underscores=no)])
+					    libc_cv_asm_underscores=no)])
   fi
 fi
 if test $libc_cv_asm_underscores = no; then
@@ -1929,13 +1929,13 @@ case $machine in
   *) cfi_offset=0;;
 esac
 cat > conftest.s <<EOF
-        .text
-        .type   func,%function
+	.text
+	.type   func,%function
 func:
-        .cfi_startproc
+	.cfi_startproc
 	.cfi_remember_state
 	.cfi_rel_offset 1, $cfi_offset
-        .cfi_endproc
+	.cfi_endproc
 EOF
 if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
   libc_cv_asm_cfi_directives=yes
@@ -2163,7 +2163,7 @@ if test "x$have_selinux" = xyes; then
 
   # See if we have the libaudit library
   AC_CHECK_LIB(audit, audit_log_user_avc_message,
-               have_libaudit=yes, have_libaudit=no)
+	       have_libaudit=yes, have_libaudit=no)
   if test "x$have_libaudit" = xyes; then
     AC_DEFINE(HAVE_LIBAUDIT, 1, [SELinux libaudit support])
   fi

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   16 ++++++
 configure      |   26 +++++-----
 configure.in   |  144 ++++++++++++++++++++++++++++----------------------------
 elf/Makefile   |   54 ++++++++++++---------
 nptl/ChangeLog |    4 ++
 nptl/Makefile  |    2 +-
 6 files changed, 138 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list