This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-423-g4861cad
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Oct 2012 23:03:25 -0000
- Subject: GNU C Library master sources branch roland/add-on-abi-tags created. glibc-2.16-ports-merge-423-g4861cad
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 4861cad63071deb51a20daebea261c5cbb738710 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4861cad63071deb51a20daebea261c5cbb738710
commit 4861cad63071deb51a20daebea261c5cbb738710
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Oct 2 16:02:12 2012 -0700
Handle abi-tags files in add-on directories too.
diff --git a/ChangeLog b/ChangeLog
index 15ffcc5..f43da9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-10-02 Roland McGrath <roland@hack.frob.com>
+ * csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on
+ directories too.
+
+2012-10-02 Roland McGrath <roland@hack.frob.com>
+
* elf/dl-load.c (_dl_map_object_from_fd: struct loadcmd):
Make 'mapoff' field ElfW(Off) rather than off_t.
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=08f750462e7a1d7a6d5638eac41898d500b1cfba
commit 08f750462e7a1d7a6d5638eac41898d500b1cfba
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue Oct 2 15:56:15 2012 -0700
Use ElfW(Off) rather than off_t for offsets within ELF files.
diff --git a/ChangeLog b/ChangeLog
index 77b6827..15ffcc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
* elf/dl-load.c (_dl_map_object_from_fd: struct loadcmd):
Make 'mapoff' field ElfW(Off) rather than off_t.
+2012-10-02 Roland McGrath <roland@hack.frob.com>
+
+ * elf/dl-load.c (_dl_map_object_from_fd: struct loadcmd):
+ Make 'mapoff' field ElfW(Off) rather than off_t.
+
2012-10-02 Dmitry V. Levin <ldv@altlinux.org>
* nscd/Makefile: Remove nscd-cflags and all its users.
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources