GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-401-gec49b8e

[roland at sourceware dot org]

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, roland/add-on-abi-tags has been created
        at  ec49b8eceefa56c1d196802f03fcc834efd08014 (commit)

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

commit ec49b8eceefa56c1d196802f03fcc834efd08014
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Sep 28 13:09:02 2012 -0700

    Handle abi-tags files in add-on directories too.

diff --git a/ChangeLog b/ChangeLog
index 040f6bf..dd443b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
+	* csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+	directories too.
+
+2012-09-28  Roland McGrath  <roland@hack.frob.com>
+
 	* nss/nsswitch.c (nss_new_service): Conditionalize definition and
 	declaration on [!DO_STATIC_NSS || SHARED], matching its only caller.
 	(__nss_lookup_function): Conditionalize label remove_from_tree on
diff --git a/csu/Makefile b/csu/Makefile
index 31300a4..5d6ab5e 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -118,10 +118,15 @@ $(addprefix $(objpfx),$(filter-out $(start-installed-name), $(csu-dummies))):\
 	$(COMPILE.c) -o $@ -x c /dev/null
 
 # These headers are used by the startup code.
-$(objpfx)abi-tag.h: $(..)abi-tags
+$(objpfx)abi-tag.h: $(..)abi-tags \
+		    $(foreach add-on,$(add-ons),\
+			      $(firstword $(wildcard \
+				$(addprefix $(firstword $(filter /%,$(add-on)) \
+					    $(..)$(add-on))/,\
+					    abi-tags))))
 	$(make-target-directory)
 	rm -f $@.new
-	sed -e 's/#.*$$//' -e '/^[	]*$$/d' $< | \
+	sed -e 's/#.*$$//' -e '/^[	]*$$/d' $^ | \
 	while read conf tagos tagver; do \
 	  test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \
 		     : "$$conf"` != 0 || continue; \
@@ -135,7 +140,7 @@ $(objpfx)abi-tag.h: $(..)abi-tags
 	    echo "#endif" ) > $@.new; \
 	done
 	if test -r $@.new; then mv -f $@.new $@; \
-	else echo >&2 'This configuration not matched in $<'; exit 1; fi
+	else echo >&2 'This configuration not matched in $^'; exit 1; fi
 
 all-Banner-files = $(wildcard $(addsuffix /Banner,\
 					  $(sort $(subdir-srcdirs) \

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

commit 9d8990721f5d37f1b3f3784d637fe60dd9454e35
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Sep 28 13:21:08 2012 -0700

    Avoid unused static function warning in nsswitch.c.

diff --git a/ChangeLog b/ChangeLog
index 5fcf34d..040f6bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 	(__nss_lookup_function): Conditionalize label remove_from_tree on
 	[!DO_STATIC_NSS || SHARED], matching its only use.
 
+2012-09-28  Roland McGrath  <roland@hack.frob.com>
+
+	* nss/nsswitch.c (nss_new_service): Conditionalize definition on
+	[!DO_STATIC_NSS || SHARED], matching its only caller.
+
 2012-09-28  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S: New file.

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


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