[commits] r8690 - in /branches/eglibc-2_9/libc: ChangeLog.eglibc elf/Makefile

[maxim@xxxxxxxxxx]

Author: maxim
Date: Tue Jul 21 07:04:19 2009
New Revision: 8690

Log:
2009-07-21  Khem Raj  <raj.khem@xxxxxxxxx>

	Backport:
	2009-01-29  Andrew Stubbs  <ams@xxxxxxxxxxxxxxxx>
	* elf/Makefile (ld.so): Adjust the sed script to insert _begin in to
	newer linker scripts.

Modified:
    branches/eglibc-2_9/libc/ChangeLog.eglibc
    branches/eglibc-2_9/libc/elf/Makefile

Modified: branches/eglibc-2_9/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_9/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_9/libc/ChangeLog.eglibc Tue Jul 21 07:04:19 2009
@@ -1,3 +1,10 @@
+2009-07-21  Khem Raj  <raj.khem@xxxxxxxxx>
+
+	Backport:
+	2009-01-29  Andrew Stubbs  <ams@xxxxxxxxxxxxxxxx>
+	* elf/Makefile (ld.so): Adjust the sed script to insert _begin in to
+	newer linker scripts.
+
 2009-06-23  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* nptl/init.c (sighandler_setxid): Remove duplicate decrement of

Modified: branches/eglibc-2_9/libc/elf/Makefile
==============================================================================
--- branches/eglibc-2_9/libc/elf/Makefile (original)
+++ branches/eglibc-2_9/libc/elf/Makefile Tue Jul 21 07:04:19 2009
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007, 2008, 2009 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
@@ -305,7 +305,7 @@
 		  $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 |	\
 		  LC_ALL=C \
 		  sed -e '/^=========/,/^=========/!d;/^=========/d'	\
-		      -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
+		      -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
 		      -e 's/\. = SEGMENT_START("text-segment", 0) + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
 		  > $@.lds
 	$(LINK.o) -nostdlib -nostartfiles -shared -o $@			\