|
From: <sv...@va...> - 2009-04-16 00:15:36
|
Author: njn Date: 2009-04-16 01:15:25 +0100 (Thu, 16 Apr 2009) New Revision: 9555 Log: Merged r9554 (fix for older automakes) from the trunk. Modified: branches/DARWIN/Makefile.flags.am Modified: branches/DARWIN/Makefile.flags.am =================================================================== --- branches/DARWIN/Makefile.flags.am 2009-04-15 23:58:26 UTC (rev 9554) +++ branches/DARWIN/Makefile.flags.am 2009-04-16 00:15:25 UTC (rev 9555) @@ -18,9 +18,20 @@ # Flags for specific targets. +# # Nb: the AM_CPPFLAGS_* values are suitable for building tools and auxprogs. # For building the core, coregrind/Makefile.am files add some extra things. +# +# Also: in newer versions of automake (1.10 onwards?) asm files ending with +# '.S' are considered "pre-processed" (as opposed to those ending in '.s') +# and so the CPPFLAGS are passed to the assembler. But this is not true for +# older automakes (e.g. 1.8.5, 1.9.6), sigh. So we include +# AM_CPPFLAGS_<PLATFORM> in each AM_CCASFLAGS_<PLATFORM> variable. This +# means some of the flags are duplicated on systems with newer versions of +# automake, but this does not really matter and seems hard to avoid. + AM_CPPFLAGS_COMMON = \ + -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I@VEX_DIR@/pub @@ -31,7 +42,7 @@ -DVGP_x86_linux=1 AM_CFLAGS_X86_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ $(AM_CFLAGS_BASE) -AM_CCASFLAGS_X86_LINUX = @FLAG_M32@ -g +AM_CCASFLAGS_X86_LINUX = $(AM_CPPFLAGS_X86_LINUX) @FLAG_M32@ -g AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@ AM_CPPFLAGS_AMD64_LINUX = $(AM_CPPFLAGS_COMMON) \ @@ -40,7 +51,7 @@ -DVGP_amd64_linux=1 AM_CFLAGS_AMD64_LINUX = @FLAG_M64@ -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) -AM_CCASFLAGS_AMD64_LINUX = @FLAG_M64@ -g +AM_CCASFLAGS_AMD64_LINUX = $(AM_CPPFLAGS_AMD64_LINUX) @FLAG_M64@ -g AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@ AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \ @@ -48,7 +59,7 @@ -DVGO_linux=1 \ -DVGP_ppc32_linux=1 AM_CFLAGS_PPC32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) -AM_CCASFLAGS_PPC32_LINUX = @FLAG_M32@ -g +AM_CCASFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_PPC32_LINUX) @FLAG_M32@ -g AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@ AM_CPPFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_COMMON) \ @@ -56,7 +67,7 @@ -DVGO_linux=1 \ -DVGP_ppc64_linux=1 AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -AM_CCASFLAGS_PPC64_LINUX = @FLAG_M64@ -g +AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ AM_CPPFLAGS_PPC32_AIX5 = $(AM_CPPFLAGS_COMMON) \ @@ -64,7 +75,8 @@ -DVGO_aix5=1 \ -DVGP_ppc32_aix5=1 AM_CFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE) -AM_CCASFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc -g +AM_CCASFLAGS_PPC32_AIX5 = $(AM_CPPFLAGS_PPC32_AIX5) \ + @FLAG_MAIX32@ -mcpu=powerpc -g AM_FLAG_M3264_PPC64_AIX5 = @FLAG_MAIX64@ AM_CPPFLAGS_PPC64_AIX5 = $(AM_CPPFLAGS_COMMON) \ @@ -72,7 +84,8 @@ -DVGO_aix5=1 \ -DVGP_ppc64_aix5=1 AM_CFLAGS_PPC64_AIX5 = @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE) -AM_CCASFLAGS_PPC64_AIX5 = @FLAG_MAIX64@ -mcpu=powerpc64 -g +AM_CCASFLAGS_PPC64_AIX5 = $(AM_CPPFLAGS_PPC64_AIX5) \ + @FLAG_MAIX64@ -mcpu=powerpc64 -g AM_FLAG_M3264_X86_DARWIN = -arch i386 AM_CPPFLAGS_X86_DARWIN = $(AM_CPPFLAGS_COMMON) \ @@ -82,9 +95,7 @@ AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 -fno-stack-protector \ -mdynamic-no-pic -# GrP fixme -O0 for debugging goes here; -O3 crashes -# [Nb: that comment was from when we had -gstabs here instead of -g] -AM_CCASFLAGS_X86_DARWIN = $(add_includes_x86_darwin) -arch i386 -g -O0 +AM_CCASFLAGS_X86_DARWIN = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64 AM_CPPFLAGS_AMD64_DARWIN = $(AM_CPPFLAGS_COMMON) \ @@ -94,7 +105,7 @@ AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 -fno-stack-protector # GrP fixme -O0 for debugging goes here -AM_CCASFLAGS_AMD64_DARWIN = $(add_includes_amd64_darwin) -arch x86_64 -g +AM_CCASFLAGS_AMD64_DARWIN = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g # Flags for the primary target. These must be used to build the # regtests and performance tests. In fact, these must be used to |