[Valgrind-developers] valgrind: r8758 - trunk

[<sv...@va...>]

Author: sewardj
Date: 2008-11-10 15:05:30 +0000 (Mon, 10 Nov 2008)
New Revision: 8758

Log:
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.



Modified:
   trunk/Makefile.am


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-11-10 02:01:17 UTC (rev 8757)
+++ trunk/Makefile.am	2008-11-10 15:05:30 UTC (rev 8758)
@@ -207,27 +207,27 @@
 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 $@