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 roland/add-on-abi-tags created. glibc-2.16-ports-merge-421-ge8f2f1b


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  e8f2f1b8db2f8d2e1fb54686682bac0b28075153 (commit)

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

commit e8f2f1b8db2f8d2e1fb54686682bac0b28075153
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 e4c1210..65a4bb9 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=0c9c0c9aebc3e2d06ec7b7017ce4061a7b59ee94

commit 0c9c0c9aebc3e2d06ec7b7017ce4061a7b59ee94
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 69d7941..e4c1210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	[BZ #10631]
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 7bf0c12..ea31417 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1090,7 +1090,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
     struct loadcmd
       {
 	ElfW(Addr) mapstart, mapend, dataend, allocend;
-	off_t mapoff;
+	ElfW(Off) mapoff;
 	int prot;
       } loadcmds[l->l_phnum], *c;
     size_t nloadcmds = 0;
@@ -1347,7 +1347,7 @@ cannot allocate TLS data structures for initial thread");
 	  l->l_text_end = l->l_addr + c->mapend;
 
 	if (l->l_phdr == 0
-	    && (ElfW(Off)) c->mapoff <= header->e_phoff
+	    && c->mapoff <= header->e_phoff
 	    && ((size_t) (c->mapend - c->mapstart + c->mapoff)
 		>= header->e_phoff + header->e_phnum * sizeof (ElfW(Phdr))))
 	  /* Found the program header in this segment.  */

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


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]