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 bdee13f80de60061912822cec11424ba4c71806f..795b52252364b9d983f11a9fa4b02f8d8c5bfc1a 100644 (file)
--- 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 $@