From: Julian Seward <jseward@acm.org>
Date: Mon, 10 Nov 2008 15:05:30 +0000 (+0000)
Subject: Adjust sed scripts used to generate the linker scripts on Linux, so as
X-Git-Tag: svn/VALGRIND_3_4_0~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab920f80a8782dcfb7abe5020b0319689ad436d9;p=thirdparty%2Fvalgrind.git

Adjust sed scripts used to generate the linker scripts on Linux, so as
to delete everything after the trailing ======.  This apparently makes
the system buildable with icc 9.1.  (patch from Philip Blakely).
Fixes #173099.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8758
---

diff --git a/Makefile.am b/Makefile.am
index bdee13f80d..795b522523 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,27 +207,27 @@ vex_primary_sources = \
 valt_load_address_x86_linux.lds: Makefile
 	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
+		-e '/^=====\+$$/,/.\*/d' \
 		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_amd64_linux.lds: Makefile
 	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
+		-e '/^=====\+$$/,/.\*/d' \
 		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_ppc32_linux.lds: Makefile
 	$(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
+		-e '/^=====\+$$/,/.\*/d' \
 		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
 	|| rm -f $@
 
 valt_load_address_ppc64_linux.lds: Makefile
 	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
-		-e '/^=====\+$$/d' \
+		-e '/^=====\+$$/,/.\*/d' \
 		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
 	|| rm -f $@