|
From: <sv...@va...> - 2010-08-22 11:51:35
|
Author: sewardj Date: 2010-08-22 12:51:26 +0100 (Sun, 22 Aug 2010) New Revision: 11276 Log: Merge from branches/THUMB: build system fixes for Thumb Modified: trunk/Makefile.all.am trunk/Makefile.vex.am Modified: trunk/Makefile.all.am =================================================================== --- trunk/Makefile.all.am 2010-08-22 10:29:32 UTC (rev 11275) +++ trunk/Makefile.all.am 2010-08-22 11:51:26 UTC (rev 11276) @@ -153,7 +153,7 @@ AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ - $(AM_CFLAGS_BASE) + $(AM_CFLAGS_BASE) -marm AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ Modified: trunk/Makefile.vex.am =================================================================== --- trunk/Makefile.vex.am 2010-08-22 10:29:32 UTC (rev 11275) +++ trunk/Makefile.vex.am 2010-08-22 11:51:26 UTC (rev 11276) @@ -54,8 +54,10 @@ # differently -- with a leading $ on x86/amd64 but none on ppc32/64. pub/libvex_guest_offsets.h: rm -f auxprogs/genoffsets.s - $(CC) $(LIBVEX_CFLAGS) -O -S -o auxprogs/genoffsets.s \ - auxprogs/genoffsets.c + $(CC) $(LIBVEX_CFLAGS) \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + -O -S -o auxprogs/genoffsets.s \ + auxprogs/genoffsets.c grep xyzzy auxprogs/genoffsets.s | grep define \ | sed "s/xyzzy\\$$//g" \ | sed "s/xyzzy#//g" \ |