This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch hjl/pr13679 created. glibc-2.16-ports-merge-335-gf232a85


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, hjl/pr13679 has been created
        at  f232a8597c1c8948a739c2de4d0b5b6cab199ae9 (commit)

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

commit f232a8597c1c8948a739c2de4d0b5b6cab199ae9
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:25:56 2012 -0700

    Run xtests if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 7115b2b..be2ce64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -155,6 +155,7 @@
 	only if $(build-shared) is yes.
 
 	* sunrpc/Makefile (tests): Run only if $(build-shared) is yes.
+	(xtests): Run only if $(build-shared) is yes.
 
 	* resolv/Makefile (tests): Add tst-leaks and depend on
 	$(objpfx)mtrace-tst-leaks only if $(build-shared) is yes.
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index c662e9e..cc4515e 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -98,12 +98,12 @@ all: # Make this the default target; it will be defined in Rules.
 
 ifeq (yes,$(build-shared))
 tests = tst-xdrmem tst-xdrmem2
-endif
 xtests := tst-getmyaddr
 
 ifeq ($(have-thread-library),yes)
 xtests += thrsvc
 endif
+endif
 
 headers += $(rpcsvc:%.x=rpcsvc/%.h)
 extra-libs := librpcsvc

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

commit 051409d6d2839c1ae93d439feab381c305e993f5
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:23:58 2012 -0700

    Make $(xtests) depend on libpthread.a for static build

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b32f838..ac1a617 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -3,6 +3,8 @@
 	[BZ #13679]
 	* Makefile (tests): Add tst-cleanup4, tst-dlsym1, tst-unload
 	and tst-cleanupx4 only if $(build-shared) is yes.
+	($(xtests)): Depend on libpthread.a if $(build-shared) isn't
+	yes.
 
 	* debug/Makefile (LDFLAGS-tst-cancel24): Renamed to ...
 	(LDLIBS-tst-cancel24): This.
diff --git a/nptl/Makefile b/nptl/Makefile
index 41cd6a9..4ab8ffe 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -541,7 +541,7 @@ $(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
 
 $(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
 else
-$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
+$(addprefix $(objpfx),$(tests) $(test-srcs) $(xtests)): $(objpfx)libpthread.a
 endif
 
 ifeq ($(build-shared),yes)

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

commit 63bab85e1a4a8d78ccb7ab71e6f98e93f20d358d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:05:47 2012 -0700

    Run db-symbols if $(build-shared) is yes

diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index fe1778e..6006896 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #13679]
+	* Makefile (tests): Depend on $(objpfx)db-symbols.out only if
+	$(build-shared) is yes.
+
 2012-03-07  Ulrich Drepper  <drepper@gmail.com>
 
 	* Makefile (distribute): Remove variable.
diff --git a/nptl_db/Makefile b/nptl_db/Makefile
index d15fb9e..b90bcd2 100644
--- a/nptl_db/Makefile
+++ b/nptl_db/Makefile
@@ -57,7 +57,9 @@ include ../Rules
 $(objpfx)libthread_db.so: $(common-objpfx)libc.so \
 			  $(common-objpfx)libc_nonshared.a
 
+ifeq (yes,$(build-shared))
 tests: $(objpfx)db-symbols.out
+endif
 $(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \
 			 $(common-objpfx)nptl/libpthread.so
 	readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@

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

commit 130c8282690d12c64a1f6af45b43853da9b7f81d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:01:43 2012 -0700

    Run nss DSO tests if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index d0bbb83..7115b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -159,6 +159,11 @@
 	* resolv/Makefile (tests): Add tst-leaks and depend on
 	$(objpfx)mtrace-tst-leaks only if $(build-shared) is yes.
 
+	* nss/Makefile (tests): Add tst-nss-test1 only if
+	$(build-shared) is yes.
+	($(objpfx)/libnss_test1.so$(libnss_test1.so-version)): Define
+	if libnss_test1.so-version is defined.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/nss/Makefile b/nss/Makefile
index a272ebe..4507c9f 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -38,7 +38,10 @@ install-bin             := getent makedb
 makedb-modules = xmalloc hash-string
 extra-objs		+= $(makedb-modules:=.o)
 
-tests			= test-netdb tst-nss-test1
+tests			= test-netdb
+ifeq (yes,$(build-shared))
+tests			+= tst-nss-test1
+endif
 xtests			= bug-erange
 
 include ../Makeconfig
@@ -111,6 +114,8 @@ CFLAGS-nss_test1.c = -DNOT_IN_libc=1
 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \
 			   $(common-objpfx)libc_nonshared.a
 	$(build-module)
+ifdef libnss_test1.so-version
 $(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so
 	$(make-link)
+endif
 $(objpfx)tst-nss-test1.out: $(objpfx)/libnss_test1.so$(libnss_test1.so-version)

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

commit 578ad5d71ef2a46107f6470bb56a4ed105ab10a1
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 08:56:42 2012 -0700

    Run libresolv.so tests if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index b30cb95..d0bbb83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -156,6 +156,9 @@
 
 	* sunrpc/Makefile (tests): Run only if $(build-shared) is yes.
 
+	* resolv/Makefile (tests): Add tst-leaks and depend on
+	$(objpfx)mtrace-tst-leaks only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/resolv/Makefile b/resolv/Makefile
index 4777317..1096ca0 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -29,7 +29,10 @@ headers	:= resolv.h \
 routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \
 	    res_hconf res_libc res-state
 
-tests = tst-aton tst-leaks tst-inet_ntop
+tests = tst-aton tst-inet_ntop
+ifeq (yes,$(build-shared))
+tests += tst-leaks
+endif
 xtests = tst-leaks2
 
 generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace
@@ -108,7 +111,7 @@ $(objpfx)tst-leaks: $(objpfx)libresolv.so
 tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace
 $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
-ifeq (no,$(cross-compiling))
+ifeq (yesno,$(build-shared)$(cross-compiling))
 ifneq (no,$(PERL))
 tests: $(objpfx)mtrace-tst-leaks
 endif

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

commit 7865d623776976fb4156fd9d84abb54318e369a1
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 08:48:33 2012 -0700

    Run sunrpc tests if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 2cc395b..b30cb95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,8 @@
 	* posix/Makefile (tests): Add tst-regex bug-regex5 bug-regex33
 	only if $(build-shared) is yes.
 
+	* sunrpc/Makefile (tests): Run only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 48a458a..c662e9e 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -96,7 +96,9 @@ others += rpcgen
 
 all: # Make this the default target; it will be defined in Rules.
 
+ifeq (yes,$(build-shared))
 tests = tst-xdrmem tst-xdrmem2
+endif
 xtests := tst-getmyaddr
 
 ifeq ($(have-thread-library),yes)

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

commit 7160bc9c18cb26d79ba7a29525b6cfaeee2fe8ea
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 08:45:55 2012 -0700

    Run regex tests with locale if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 78ca5de..2cc395b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -151,6 +151,9 @@
 	(tests): Add tst-strptime only if $(build-shared) is yes.  Add
 	$(tests-static).
 
+	* posix/Makefile (tests): Add tst-regex bug-regex5 bug-regex33
+	only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/posix/Makefile b/posix/Makefile
index 3560bb2..6e12f27 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -68,14 +68,14 @@ tests		:= tstgetopt testfnm runtests runptests	     \
 		   tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \
 		   tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
 		   tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
-		   tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \
+		   tst-gnuglob bug-regex6 bug-regex7 \
 		   bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12 \
 		   bug-regex13 bug-regex14 bug-regex15 bug-regex16 \
 		   bug-regex17 bug-regex18 bug-regex19 bug-regex20 \
 		   bug-regex21 bug-regex22 bug-regex23 bug-regex24 \
 		   bug-regex25 bug-regex26 bug-regex27 bug-regex28 \
 		   bug-regex29 bug-regex30 bug-regex31 bug-regex32 \
-		   bug-regex33 tst-nice tst-nanosleep tst-regex2 \
+		   tst-nice tst-nanosleep tst-regex2 \
 		   transbug tst-rxspencer tst-pcre tst-boost \
 		   bug-ga1 tst-vfork1 tst-vfork2 tst-vfork3 tst-waitid \
 		   tst-getaddrinfo2 bug-glob1 bug-glob2 bug-glob3 tst-sysconf \
@@ -90,7 +90,8 @@ tests		:= tstgetopt testfnm runtests runptests	     \
 xtests		:= bug-ga2
 ifeq (yes,$(build-shared))
 test-srcs	:= globtest
-tests           += wordexp-test tst-exec tst-spawn
+tests           += wordexp-test tst-exec tst-spawn tst-regex bug-regex5 \
+		   bug-regex33
 endif
 others		:= getconf
 install-bin	:= getconf

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

commit 5b0d64706beb67fb2c5dc958fac43df7392dd8d9
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 06:15:18 2012 -0700

    Add time/tst-strptime-static.c

diff --git a/ChangeLog b/ChangeLog
index f2a8a94..78ca5de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,6 +147,10 @@
 	* wcsmbs/Makefile (tests): Add tst-btowc tst-mbrtowc2 only if
 	$(build-shared) is yes.
 
+	* time/Makefile (tests-static): New.  Test tst-strptime-static.
+	(tests): Add tst-strptime only if $(build-shared) is yes.  Add
+	$(tests-static).
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/time/Makefile b/time/Makefile
index ffa3e88..5975bc3 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -32,10 +32,15 @@ routines := offtime asctime clock ctime ctime_r difftime \
 	    timespec_get
 aux :=	    era alt_digit lc-time-cleanup
 
-tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
+tests	:= test_time clocktest tst-posixtz tst_wcsftime \
 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
 	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
 	   tst-strptime3 bug-getdate1
+tests-static = tst-strptime-static
+tests += $(tests-static)
+ifeq (yes,$(build-shared))
+tests += tst-strptime
+endif
 
 include ../Rules
 
diff --git a/time/tst-strptime-static.c b/time/tst-strptime-static.c
new file mode 100644
index 0000000..eab0f33
--- /dev/null
+++ b/time/tst-strptime-static.c
@@ -0,0 +1,2 @@
+#define STATIC_TEST
+#include "tst-strptime.c"
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 32001d4..fb75522 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -45,8 +45,10 @@ static const struct
     6, 0, 0, 1 },
   { "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p",
     6, 0, 0, 1 },
+#ifndef STATIC_TEST
   { "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
   { "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
+#endif
 };
 
 

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

commit 9f40255ce22113b5fbc831697079f48edfe9bf67
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 07:45:30 2012 -0700

    Run tst-btowc tst-mbrtowc2 if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 7743cf7..f2a8a94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -144,6 +144,9 @@
 	* libio/Makefile (tests): Add tst-fopenloc and
 	$(objpfx)tst-fopenloc.check only if $(build-shared) is yes.
 
+	* wcsmbs/Makefile (tests): Add tst-btowc tst-mbrtowc2 only if
+	$(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 7402ec9..66d3e2c 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -42,9 +42,12 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
 	    mbrtoc16 c16rtomb
 
 strop-tests :=  wcscmp wmemcmp wcslen wcschr wcsrchr wcscpy
-tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
-	 tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \
+tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-mbrtowc \
+	 tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h \
 	 tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests))
+ifeq (yes,$(build-shared))
+tests += tst-btowc tst-mbrtowc2
+endif
 
 include ../Rules
 

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

commit 42f0505d8b86d306c02974b37ea52b795c34730b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 07:43:58 2012 -0700

    Run tst-fopenloc if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 62638b2..7743cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -141,6 +141,9 @@
 	* iconv/gconv_db.c (free_derivation): Check if deriv->steps
 	is NULL.
 
+	* libio/Makefile (tests): Add tst-fopenloc and
+	$(objpfx)tst-fopenloc.check only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/libio/Makefile b/libio/Makefile
index c555dd0..f7ba1b9 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -47,7 +47,7 @@ routines	:=							      \
 	libc_fatal fmemopen
 
 tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
-	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 tst-fopenloc \
+	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-ext2 \
 	tst-fgetws tst-ungetwc1 tst-ungetwc2 tst-swscanf tst-sscanf	      \
 	tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof          \
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
@@ -58,6 +58,9 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst-wmemstream1 tst-wmemstream2 \
 	bug-memstream1 bug-wmemstream1 \
 	tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos bug-fclose1
+ifeq (yes,$(build-shared))
+tests += tst-fopenloc
+endif
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
@@ -170,7 +173,10 @@ shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
 include ../Rules
 
 ifeq (no,$(cross-compiling))
-tests: $(objpfx)test-freopen.out $(objpfx)tst-fopenloc.check
+tests: $(objpfx)test-freopen.out
+ifeq (yes,$(build-shared))
+tests:$(objpfx)tst-fopenloc.check
+endif
 endif
 
 $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen

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

commit 7c2375149adaf7cacf0a2b5f261c27a5adaa268f
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 05:59:58 2012 -0700

    Check if deriv->steps is NULL before freeing it

diff --git a/ChangeLog b/ChangeLog
index 8de0398..62638b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -138,6 +138,9 @@
 	* stdio-common/Makefile (tests): Add tst-swprintf only if
 	$(build-shared) is yes.
 
+	* iconv/gconv_db.c (free_derivation): Check if deriv->steps
+	is NULL.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index a081205..703c9e3 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -193,10 +193,13 @@ free_derivation (void *p)
       }
 
   /* Free the name strings.  */
-  free ((char *) deriv->steps[0].__from_name);
-  free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+  if (deriv->steps)
+    {
+      free ((char *) deriv->steps[0].__from_name);
+      free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+      free ((struct __gconv_step *) deriv->steps);
+    }
 
-  free ((struct __gconv_step *) deriv->steps);
   free (deriv);
 }
 

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

commit 5969fb745f3424e56c9b3bbe0f7e9a01d2809bbb
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 05:41:43 2012 -0700

    Test tst-swprintf if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index ae1eb13..8de0398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,9 @@
 	* catgets/Makefile (tests): Enabled only if $(build-shared) is
 	yes.
 
+	* stdio-common/Makefile (tests): Add tst-swprintf only if
+	$(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 5d7ab53..7267c80 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -50,7 +50,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 tfformat tiformat tllformat tstdiomisc tst-printfsz tst-wc-printf \
 	 scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
 	 scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
-	 tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
+	 tst-fseek tst-fmemopen test-vfprintf tst-gets \
 	 tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 \
 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
@@ -58,6 +58,9 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
 	 bug-vfprintf-nargs tst-long-dbl-fphex tst-fphex-wide tst-sprintf3 \
 	 bug25
+ifeq (yes,$(build-shared))
+tests += tst-swprintf
+endif
 
 test-srcs = tst-unbputc tst-printf
 

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

commit d89828e1c53fbbc05e6d2af0cbc7edcc2f7c447d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 07:38:21 2012 -0700

    Enable catgets tests if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index 8cdfa06..ae1eb13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -132,6 +132,9 @@
 	tst_wcscoll tst_wcsrtombs tst_wcstombs tst_wctob tst_wctomb
 	bug-iconv-trans only if $(build-shared) is yes.
 
+	* catgets/Makefile (tests): Enabled only if $(build-shared) is
+	yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/catgets/Makefile b/catgets/Makefile
index c11edd3..ded62ab 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -26,7 +26,9 @@ others		= gencat
 install-bin	= gencat
 extra-objs	= $(gencat-modules:=.o)
 
+ifeq ($(build-shared),yes)
 tests = tst-catgets
+endif
 test-srcs = test-gencat
 
 gencat-modules	= xmalloc
@@ -50,7 +52,7 @@ generated-dirs = de
 
 tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
 
-ifneq ($(cross-compiling),yes)
+ifeq ($(build-shared)$(cross-compiling),yesno)
 tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
        $(objpfx)test-gencat.out
 # This test just checks whether the program produces any error or not.

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

commit 702015cc4b6f85e9142352ba0544ebf444152ed5
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 06:56:05 2012 -0700

    Run localedata DSO tests only if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index c899e05..8cdfa06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -123,6 +123,15 @@
 	is yes,  otherwise set to idn-stub-static.
 	* libidn/idn-stub-static.c: New file.
 
+	* localedata/Makefile (locale_test_suite): Remove tst_mblen
+	tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs tst_mbtowc
+	tst_strcoll tst_swscanf tst_wcrtomb tst_wcscoll tst_wcsrtombs
+	tst_wcstombs tst_wctob tst_wctomb bug-iconv-trans.
+	(tests): Add tst_mblen tst_mbrlen tst_mbrtowc tst_mbsrtowcs
+	tst_mbstowcs tst_mbtowc tst_strcoll tst_swscanf tst_wcrtomb
+	tst_wcscoll tst_wcsrtombs tst_wcstombs tst_wctob tst_wctomb
+	bug-iconv-trans only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/localedata/Makefile b/localedata/Makefile
index 0873a55..a073bce 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -64,22 +64,25 @@ ifeq (no,$(cross-compiling))
 locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
 		     tst_iswctype tst_iswdigit tst_iswgraph            \
 		     tst_iswlower tst_iswprint tst_iswpunct            \
-		     tst_iswspace tst_iswupper tst_iswxdigit tst_mblen \
-		     tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
-		     tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm    \
-		     tst_swscanf tst_towctrans tst_towlower            \
-		     tst_towupper tst_wcrtomb tst_wcscat tst_wcschr    \
-		     tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn     \
+		     tst_iswspace tst_iswupper tst_iswxdigit	       \
+		     tst_strfmon tst_strxfrm			       \
+		     tst_towctrans tst_towlower		               \
+		     tst_towupper tst_wcscat tst_wcschr		       \
+		     tst_wcscmp tst_wcscpy tst_wcscspn		       \
 		     tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy    \
-		     tst_wcspbrk tst_wcsrtombs tst_wcsspn tst_wcsstr   \
-		     tst_wcstod tst_wcstok tst_wcstombs tst_wcswidth   \
-		     tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans      \
+		     tst_wcspbrk tst_wcsspn tst_wcsstr		       \
+		     tst_wcstod tst_wcstok tst_wcswidth		       \
+		     tst_wcsxfrm tst_wctrans			       \
 		     tst_wctype tst_wcwidth
 
-tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
+tests = $(locale_test_suite) tst-digits tst-setlocale \
 	tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
-	tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2
+	tst-strfmon1 tst-sscanf tst-setlocale2
 ifeq (yes,$(build-shared))
+tests += tst_mblen tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
+	 tst_mbtowc tst_strcoll tst_swscanf tst_wcrtomb tst_wcscoll \
+	 tst_wcsrtombs tst_wcstombs tst_wctob tst_wctomb bug-iconv-trans \
+	 bug-setlocale1
 ifneq (no,$(PERL))
 tests: $(objpfx)mtrace-tst-leaks
 endif
@@ -139,10 +142,12 @@ $(addprefix $(objpfx),$(CTYPE_FILES)): %: \
 $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \
   $(addprefix $(objpfx),$(CTYPE_FILES))
 
+ifeq (yes,$(build-shared))
 tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
        $(objpfx)tst-rpmatch.out $(objpfx)tst-trans.out \
        $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
        $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
+endif
 
 $(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
 		       $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))

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

commit 6dfdc083a38e64cc29e7a1d124b811615f6ef764
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 06:54:50 2012 -0700

    Add libidn/idn-stub-static.c

diff --git a/ChangeLog b/ChangeLog
index e84207a..c899e05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,10 @@
 	* sysdeps/x86_64/Makefile (tests): Add tst-quad1, tst-quad2,
 	$(objpfx)tst-xmmymm.out only if $(build-shared) is yes.
 
+	* libidn/Makefile (routines): Set to idn-stub if $(build-shared)
+	is yes,  otherwise set to idn-stub-static.
+	* libidn/idn-stub-static.c: New file.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/libidn/Makefile b/libidn/Makefile
index 8342c46..3bb49f3 100644
--- a/libidn/Makefile
+++ b/libidn/Makefile
@@ -19,7 +19,11 @@
 
 subdir	:= libidn
 
+ifeq (yes,$(build-shared))
 routines = idn-stub
+else
+routines = idn-stub-static
+endif
 
 extra-libs		= libcidn
 extra-libs-others	= $(extra-libs)
diff --git a/libidn/idn-stub-static.c b/libidn/idn-stub-static.c
new file mode 100644
index 0000000..08c7e69
--- /dev/null
+++ b/libidn/idn-stub-static.c
@@ -0,0 +1,32 @@
+/* idn-stub-static.c --- Dummy stubs for libcidn.
+   Copyright (C) 2012 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+
+int
+__idna_to_ascii_lz (const char *input, char **output, int flags)
+{
+  return 0;
+}
+
+int
+__idna_to_unicode_lzlz (const char *input, char **output, int flags)
+{
+  *output = NULL;
+  return 0;
+}

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

commit 147db27602cb298ce7f4c91c4c1acb976593f08e
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:43:21 2012 -0700

    Run nptl ld.so tests only if $(build-shared) is yes

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 219c49e..b32f838 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,9 @@
 2012-09-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #13679]
+	* Makefile (tests): Add tst-cleanup4, tst-dlsym1, tst-unload
+	and tst-cleanupx4 only if $(build-shared) is yes.
+
 	* debug/Makefile (LDFLAGS-tst-cancel24): Renamed to ...
 	(LDLIBS-tst-cancel24): This.
 
diff --git a/nptl/Makefile b/nptl/Makefile
index 6f2b66c..41cd6a9 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -238,7 +238,7 @@ tests = tst-typesizes \
 	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
 	tst-cancel-self tst-cancel-self-cancelstate \
 	tst-cancel-self-canceltype tst-cancel-self-testcancel \
-	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \
+	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \
 	tst-flock1 tst-flock2 \
 	tst-signal1 tst-signal2 tst-signal3 tst-signal4 tst-signal5 \
 	tst-signal6 tst-signal7 \
@@ -246,8 +246,6 @@ tests = tst-typesizes \
 	tst-exit1 tst-exit2 tst-exit3 \
 	tst-stdio1 tst-stdio2 \
 	tst-stack1 tst-stack2 tst-stack3 tst-pthread-getattr \
-	tst-unload \
-	tst-dlsym1 \
 	tst-sysconf \
 	tst-locale1 tst-locale2 \
 	tst-umask1 \
@@ -261,6 +259,9 @@ tests = tst-typesizes \
 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
 	tst-getpid1 tst-getpid2 tst-getpid3 \
 	tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
+ifeq (yes,$(build-shared))
+tests += tst-cleanup4 tst-dlsym1 tst-unload
+endif
 xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
 
 # Files which must not be linked with libpthread.
@@ -282,12 +283,12 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
 	 tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \
 	 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \
 	 tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
-	 tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \
+	 tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 \
 	 tst-oncex3 tst-oncex4
 endif
 ifeq ($(build-shared),yes)
 tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \
-	 tst-stackguard1
+	 tst-stackguard1 tst-cleanupx4
 tests-nolibpthread += tst-fini1
 ifeq ($(have-z-execstack),yes)
 tests += tst-execstack

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

commit d30dbb949a54319070050ce791e6a41c54d967b2
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Sep 6 21:48:58 2012 -0700

    Run ld.so tests only if $(build-shared) is yes

diff --git a/ChangeLog b/ChangeLog
index b8869b5..e84207a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,11 @@
 	* scripts/check-local-headers.sh: Replace */*.{o,os,oS}.d with
 	*/*.o*.d.
 
+	* elf/Makefile (tests): Add tst-tls9, $(objpfx)noload-mem
+	and $(objpfx)tst-unused-dep.out only if $(build-shared) is yes.
+	* sysdeps/x86_64/Makefile (tests): Add tst-quad1, tst-quad2,
+	$(objpfx)tst-xmmymm.out only if $(build-shared) is yes.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/elf/Makefile b/elf/Makefile
index b999376..4e9d64f 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -112,7 +112,10 @@ $(inst_auditdir)/sotruss-lib.so: $(objpfx)sotruss-lib.so $(+force)
 	$(do-install-program)
 endif
 
-tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1
+tests = tst-tls1 tst-tls2 tst-leaks1
+ifeq (yes,$(build-shared))
+tests += tst-tls9
+endif
 ifeq (yes,$(have-initfini-array))
 tests += tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
 endif
@@ -158,7 +161,10 @@ endif
 endif
 endif
 ifeq ($(cross-compiling),no)
-tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-mem
+tests: $(objpfx)tst-leaks1-mem
+ifeq (yes,$(build-shared))
+tests: $(objpfx)noload-mem
+endif
 endif
 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
@@ -1161,7 +1167,7 @@ $(objpfx)tst-relsort1mod2.so: $(libm)
 $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
 			   $(objpfx)tst-relsort1mod2.so
 
-ifeq ($(cross-compiling),no)
+ifeq ($(cross-compiling)$(build-shared),noyes)
 tests: $(objpfx)tst-unused-dep.out
 endif
 
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index d4525bc..0c4f345 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -25,20 +25,26 @@ sysdep-dl-routines += tlsdesc dl-tlsdesc
 sysdep_routines += tlsdesc dl-tlsdesc
 sysdep-rtld-routines += tlsdesc dl-tlsdesc
 
+ifeq (yes,$(build-shared))
 tests += tst-quad1 tst-quad2
+endif
 modules-names += tst-quadmod1 tst-quadmod2
 
 $(objpfx)tst-quad1: $(objpfx)tst-quadmod1.so
 $(objpfx)tst-quad2: $(objpfx)tst-quadmod2.so
 
 quad-pie-test += tst-quad1pie tst-quad2pie
+ifeq (yes,$(build-shared))
 tests += $(quad-pie-test)
+endif
 tests-pie += $(quad-pie-test)
 
 $(objpfx)tst-quad1pie: $(objpfx)tst-quadmod1pie.o
 $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
 
+ifeq (yes,$(build-shared))
 tests: $(objpfx)tst-xmmymm.out
+endif
 $(objpfx)tst-xmmymm.out: ../sysdeps/x86_64/tst-xmmymm.sh $(objpfx)ld.so
 	@echo "Checking ld.so for SSE register use.  This will take a few seconds..."
 	$(SHELL) -e $< $(objpfx) > $@

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

commit 66a02e035637aa20d21d61d6ff24d88a28d5c04d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Sep 6 21:10:31 2012 -0700

    Replace */*.{o,os,oS}.d with */*.o*.d

diff --git a/ChangeLog b/ChangeLog
index 87aa609..b8869b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,9 @@
 	(__idna_to_unicode_lzlz): Likewise.
 	(_res_hconf_init): Likewise.
 
+	* scripts/check-local-headers.sh: Replace */*.{o,os,oS}.d with
+	*/*.o*.d.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 08ed880..a2ca8ad 100755
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -39,4 +39,4 @@ BEGIN {
     }
   }
 }
-END { exit status }' */*.{o,os,oS}.d
+END { exit status }' */*.o*.d

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

commit a7697ec8836e22a52db7ab65b69316c4db869433
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Sep 6 12:19:13 2012 -0700

    Free errstring if _dl_addr returns 0

diff --git a/ChangeLog b/ChangeLog
index 8922f27..87aa609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@
 	isn't yes.
 	(static-gnulib): Add -lgcc_eh if $(build-shared) isn't yes.
 
+	* dlfcn/dlerror.c (check_free): Free errstring if _dl_addr
+	returns 0.
+
 	* debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
 	(LDLIBS-tst-chk4): This.
 	(LDFLAGS-tst-chk5): Renamed to ...
diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index 8138cc2..4c7ca87 100644
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -193,8 +193,8 @@ check_free (struct dl_action_result *rec)
 	 always the C library in the base namespave.  */
       struct link_map *map = NULL;
       Dl_info info;
-      if (_dl_addr (check_free, &info, &map, NULL) != 0
-	  && map != NULL && map->l_ns == 0)
+      if (_dl_addr (check_free, &info, &map, NULL) == 0
+	  || (map != NULL && map->l_ns == 0))
 	free ((char *) rec->errstring);
     }
 }

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

commit 0e8ab283dd83a5f5472d66e01531595ea28b7f42
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Sep 5 15:53:28 2012 -0700

    Redefine glibc functions in rfc3484 tests

diff --git a/ChangeLog b/ChangeLog
index ccc6026..8922f27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,28 @@
 	(LDFLAGS-tst-lfschk6): Renamed to ...
 	(LDLIBS-tst-lfschk6): This.
 
+	* posix/tst-rfc3484.c (__check_pf): Redefined to avoid
+	conflict.
+	(__free_in6ai): Likewise.
+	(__check_native): Likewise.
+	(__idna_to_ascii_lz): Likewise.
+	(__idna_to_unicode_lzlz): Likewise.
+	(_res_hconf_init): Likewise.
+	* posix/tst-rfc3484-2.c (__check_pf): Likewise.
+	conflict.
+	(__free_in6ai): Likewise.
+	(__check_native): Likewise.
+	(__idna_to_ascii_lz): Likewise.
+	(__idna_to_unicode_lzlz): Likewise.
+	(_res_hconf_init): Likewise.
+	* posix/tst-rfc3484-3.c (__check_pf): Likewise.
+	conflict.
+	(__free_in6ai): Likewise.
+	(__check_native): Likewise.
+	(__idna_to_ascii_lz): Likewise.
+	(__idna_to_unicode_lzlz): Likewise.
+	(_res_hconf_init): Likewise.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index a37be36..1a65041 100644
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -10,6 +10,13 @@
 #define __gethostbyaddr_r gethostbyaddr_r
 #define __gethostbyname2_r gethostbyname2_r
 
+#define __check_pf		__check_pf_redirect
+#define __free_in6ai		__free_in6ai_redirect
+#define __check_native		__check_native_redirect
+#define __idna_to_ascii_lz	__idna_to_ascii_lz_redirect
+#define __idna_to_unicode_lzlz	__idna_to_unicode_lzlz_redirect
+#define _res_hconf_init		_res_hconf_init_redirect
+
 void
 attribute_hidden
 __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
@@ -56,6 +63,13 @@ _res_hconf_init (void)
 #undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
+#undef __check_pf
+#undef __free_in6ai
+#undef __check_native
+#undef __idna_to_ascii_lz
+#undef __idna_to_unicode_lzlz
+#undef _res_hconf_init
+
 service_user *__nss_hosts_database attribute_hidden;
 
 
diff --git a/posix/tst-rfc3484-3.c b/posix/tst-rfc3484-3.c
index 493e760..a93e4cd 100644
--- a/posix/tst-rfc3484-3.c
+++ b/posix/tst-rfc3484-3.c
@@ -10,6 +10,13 @@
 #define __gethostbyaddr_r gethostbyaddr_r
 #define __gethostbyname2_r gethostbyname2_r
 
+#define __check_pf		__check_pf_redirect
+#define __free_in6ai		__free_in6ai_redirect
+#define __check_native		__check_native_redirect
+#define __idna_to_ascii_lz	__idna_to_ascii_lz_redirect
+#define __idna_to_unicode_lzlz	__idna_to_unicode_lzlz_redirect
+#define _res_hconf_init		_res_hconf_init_redirect
+
 void
 attribute_hidden
 __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
@@ -56,6 +63,13 @@ _res_hconf_init (void)
 #undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
+#undef __check_pf
+#undef __free_in6ai
+#undef __check_native
+#undef __idna_to_ascii_lz
+#undef __idna_to_unicode_lzlz
+#undef _res_hconf_init
+
 service_user *__nss_hosts_database attribute_hidden;
 
 
diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index 29e1461..a5eaffa 100644
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -10,6 +10,13 @@
 #define __gethostbyaddr_r gethostbyaddr_r
 #define __gethostbyname2_r gethostbyname2_r
 
+#define __check_pf		__check_pf_redirect
+#define __free_in6ai		__free_in6ai_redirect
+#define __check_native		__check_native_redirect
+#define __idna_to_ascii_lz	__idna_to_ascii_lz_redirect
+#define __idna_to_unicode_lzlz	__idna_to_unicode_lzlz_redirect
+#define _res_hconf_init		_res_hconf_init_redirect
+
 void
 attribute_hidden
 __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen)
@@ -56,6 +63,13 @@ _res_hconf_init (void)
 #undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
+#undef __check_pf
+#undef __free_in6ai
+#undef __check_native
+#undef __idna_to_ascii_lz
+#undef __idna_to_unicode_lzlz
+#undef _res_hconf_init
+
 service_user *__nss_hosts_database attribute_hidden;
 
 

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

commit 13be396863941b20265646c7fdf9cb3cf49259d0
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 7 09:41:40 2012 -0700

    Rename LDFLAGS-XXX to LDLIBS-XXX for -lstdc++

diff --git a/ChangeLog b/ChangeLog
index b460b1d..ccc6026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,19 @@
 	isn't yes.
 	(static-gnulib): Add -lgcc_eh if $(build-shared) isn't yes.
 
+	* debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
+	(LDLIBS-tst-chk4): This.
+	(LDFLAGS-tst-chk5): Renamed to ...
+	(LDLIBS-tst-chk5): This.
+	(LDFLAGS-tst-chk6): Renamed to ...
+	(LDLIBS-tst-chk6): This.
+	(LDFLAGS-tst-lfschk4): Renamed to ...
+	(LDLIBS-tst-lfschk4): This.
+	(LDFLAGS-tst-lfschk5): Renamed to ...
+	(LDLIBS-tst-lfschk5): This.
+	(LDFLAGS-tst-lfschk6): Renamed to ...
+	(LDLIBS-tst-lfschk6): This.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14544]
diff --git a/debug/Makefile b/debug/Makefile
index f4e38b4..ae5b674 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -114,12 +114,12 @@ tst-lfschk3-ENV = LOCPATH=$(common-objpfx)localedata
 tst-lfschk4-ENV = LOCPATH=$(common-objpfx)localedata
 tst-lfschk5-ENV = LOCPATH=$(common-objpfx)localedata
 tst-lfschk6-ENV = LOCPATH=$(common-objpfx)localedata
-LDFLAGS-tst-chk4 = -lstdc++
-LDFLAGS-tst-chk5 = -lstdc++
-LDFLAGS-tst-chk6 = -lstdc++
-LDFLAGS-tst-lfschk4 = -lstdc++
-LDFLAGS-tst-lfschk5 = -lstdc++
-LDFLAGS-tst-lfschk6 = -lstdc++
+LDLIBS-tst-chk4 = -lstdc++
+LDLIBS-tst-chk5 = -lstdc++
+LDLIBS-tst-chk6 = -lstdc++
+LDLIBS-tst-lfschk4 = -lstdc++
+LDLIBS-tst-lfschk5 = -lstdc++
+LDLIBS-tst-lfschk6 = -lstdc++
 
 tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \
 	tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 34b3698..219c49e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #13679]
+	* debug/Makefile (LDFLAGS-tst-cancel24): Renamed to ...
+	(LDLIBS-tst-cancel24): This.
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14545]
diff --git a/nptl/Makefile b/nptl/Makefile
index ad7ac05..6f2b66c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -507,7 +507,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
 $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
 endif
 
-LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
+LDLIBS-tst-cancel24 = $(no-as-needed) -lstdc++
 
 extra-B-pthread.so = -B$(common-objpfx)nptl/
 $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))

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

commit b54724867228c7a6501a0e350573b9c069429ca4
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Sep 5 11:00:50 2012 -0700

    Remove gnu/stubs.h dependency on soversions.mk

diff --git a/ChangeLog b/ChangeLog
index e3996f1..b460b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,9 @@
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #13679]
+	* Makefile ($(inst_includedir)/gnu/stubs.h): Remove dependency
+	on $(common-objpfx)soversions.mk.
+
 	* Makeconfig (+link): Defined as $(+link-static) if
 	$(build-shared) isn't yes.
 	(link-tests): Defined as $(+link-static-tests) if $(build-shared)
diff --git a/Makefile b/Makefile
index 50c3eed..5617acc 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
 installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
 
-$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
+$(inst_includedir)/gnu/stubs.h: $(+force)
 	$(make-target-directory)
 	{ \
 	 echo '/* This file is automatically generated.';\

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

commit a0bd0737d48c80aadb54ce175101d4523c921d9d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Sep 5 09:08:56 2012 -0700

    Use static link by default for --disable-shared

diff --git a/ChangeLog b/ChangeLog
index 9a3b132..e3996f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,15 @@
 
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
+	[BZ #13679]
+	* Makeconfig (+link): Defined as $(+link-static) if
+	$(build-shared) isn't yes.
+	(link-tests): Defined as $(+link-static-tests) if $(build-shared)
+	isn't yes.
+	(static-gnulib): Add -lgcc_eh if $(build-shared) isn't yes.
+
+2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
 	[BZ #14544]
 	* Makeconfig (link-static-before-libc): Replace $(+prector)
 	with $(+prectorT).
diff --git a/Makeconfig b/Makeconfig
index 3ed9746..4fe15f5 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -411,22 +411,6 @@ LDFLAGS.so += $(hashstyle-LDFLAGS)
 LDFLAGS-rtld += $(hashstyle-LDFLAGS)
 endif
 
-# Commands for linking programs with the C library.
-ifndef +link
-+link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
-	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
-	      $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
-	      $(addprefix $(csu-objpfx),$(start-installed-name)) \
-	      $(+preinit) $(+prector) \
-	      $(filter-out $(addprefix $(csu-objpfx),start.o \
-						     $(start-installed-name))\
-			   $(+preinit) $(link-extra-libs) \
-			   $(common-objpfx)libc% $(+postinit),$^) \
-	      $(link-extra-libs)
-+link-after-libc = $(+postctor) $(+postinit)
-+link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
-+link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
-endif
 # Command for linking PIE programs with the C library.
 ifndef +link-pie
 +link-pie = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
@@ -457,6 +441,27 @@ ifndef +link-static
 +link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \
 		     $(+link-static-after-libc)
 endif
+# Commands for linking programs with the C library.
+ifndef +link
+ifeq (yes,$(build-shared))
++link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
+	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+	      $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
+	      $(addprefix $(csu-objpfx),$(start-installed-name)) \
+	      $(+preinit) $(+prector) \
+	      $(filter-out $(addprefix $(csu-objpfx),start.o \
+						     $(start-installed-name))\
+			   $(+preinit) $(link-extra-libs) \
+			   $(common-objpfx)libc% $(+postinit),$^) \
+	      $(link-extra-libs)
++link-after-libc = $(+postctor) $(+postinit)
++link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
++link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
+else
++link = $(+link-static)
++link-tests = $(+link-static-tests)
+endif
+endif
 # Command for statically linking bounded-pointer programs with the C library.
 ifndef +link-bounded
 +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
@@ -568,7 +573,14 @@ gnulib-arch =
 gnulib = -lgcc $(gnulib-arch)
 gnulib-tests := -lgcc $(libgcc_eh)
 static-gnulib-arch =
+# By default, elf/static-stubs.o, instead of -lgcc_eh, is used to
+# statically link programs.  When --disable-shared is used, we use
+# -lgcc_eh since elf/static-stubs.o isn't sufficient.
+ifeq (yes,$(build-shared))
 static-gnulib = -lgcc $(static-gnulib-arch)
+else
+static-gnulib = -lgcc -lgcc_eh $(static-gnulib-arch)
+endif
 static-gnulib-tests := -lgcc -lgcc_eh $(libunwind)
 libc.so-gnulib := -lgcc
 endif

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


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]