|
From: <sv...@va...> - 2005-08-17 08:50:55
|
Author: tom Date: 2005-08-17 09:50:51 +0100 (Wed, 17 Aug 2005) New Revision: 4442 Log: Pass AM_CFLAGS to the compiler when extracting the default linker script so we are sure to get the 32 bit version when appropriate. Also pass ARCH_CORE_AM_CFLAGS in EXTRA_CFLAGS when building VEX so we can be sure to build a 32 bit VEX when appropriate. This should fix bug #110830. Modified: trunk/coregrind/Makefile.am Modified: trunk/coregrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/coregrind/Makefile.am 2005-08-17 05:01:37 UTC (rev 4441) +++ trunk/coregrind/Makefile.am 2005-08-17 08:50:51 UTC (rev 4442) @@ -191,14 +191,14 @@ # So we search for the line with a hex value "+ SIZEOF_HEADERS", and rep= lace # all the hex values in that line with "kickstart_base". stage2.lds: Makefile - $(CC) -Wl,--verbose -nostdlib 2>&1 | sed \ + $(CC) $(AM_CFLAGS) -Wl,--verbose -nostdlib 2>&1 | sed \ -e '1,/^=3D=3D=3D=3D=3D\+$$/d' \ -e '/^=3D=3D=3D=3D=3D\+$$/d' \ -e '/\. =3D 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/kicksta= rt_base/g' > $@ \ || rm -f $@ =20 @VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS=3D"@PIE_AM_CFLAGS@" + $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS=3D"@ARCH_CORE_AM_CFLAGS@ @PI= E_AM_CFLAGS@" =20 @VEX_DIR@/priv/main/vex_svnversion.h: $(MAKE) -C @VEX_DIR@ version |