From: Nicholas Nethercote Date: Fri, 6 Feb 2009 04:49:14 +0000 (+0000) Subject: Removed Makefile.core.am with some judicious refactoring. X-Git-Tag: svn/VALGRIND_3_5_0~1017 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=009cd24326165071e37879ddc022d17141418f77;p=thirdparty%2Fvalgrind.git Removed Makefile.core.am with some judicious refactoring. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9114 --- diff --git a/Makefile.core.am b/Makefile.core.am deleted file mode 100644 index 4479463294..0000000000 --- a/Makefile.core.am +++ /dev/null @@ -1,42 +0,0 @@ -add_includes_COMMON = \ - -I$(top_srcdir)/coregrind \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub - -add_includes_x86_linux = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"x86-linux\"" \ - -DVGA_x86=1 \ - -DVGO_linux=1 \ - -DVGP_x86_linux=1 - -add_includes_amd64_linux = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"amd64-linux\"" \ - -DVGA_amd64=1 \ - -DVGO_linux=1 \ - -DVGP_amd64_linux=1 - -add_includes_ppc32_linux = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"ppc32-linux\"" \ - -DVGA_ppc32=1 \ - -DVGO_linux=1 \ - -DVGP_ppc32_linux=1 - -add_includes_ppc64_linux = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"ppc64-linux\"" \ - -DVGA_ppc64=1 \ - -DVGO_linux=1 \ - -DVGP_ppc64_linux=1 - -add_includes_ppc32_aix5 = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"ppc32-aix5\"" \ - -DVGA_ppc32=1 \ - -DVGO_aix5=1 \ - -DVGP_ppc32_aix5=1 - -add_includes_ppc64_aix5 = $(add_includes_COMMON) \ - -DVG_PLATFORM="\"ppc64-aix5\"" \ - -DVGA_ppc64=1 \ - -DVGO_aix5=1 \ - -DVGP_ppc64_aix5=1 - -include $(top_srcdir)/Makefile.flags.am diff --git a/Makefile.flags.am b/Makefile.flags.am index 42a08513a4..244243dd00 100644 --- a/Makefile.flags.am +++ b/Makefile.flags.am @@ -12,37 +12,61 @@ AM_CFLAGS_BASE = -O2 -g -Wmissing-prototypes -Wall -Wshadow \ # into (and through) the preloads. AM_CFLAGS_PIC = -O -g -fpic -fno-omit-frame-pointer -fno-strict-aliasing -# Flags for specific targets +# 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. +AM_CPPFLAGS_COMMON = \ + -I$(top_srcdir)/include \ + -I@VEX_DIR@/pub + AM_FLAG_M3264_X86_LINUX = @FLAG_M32@ -AM_CPPFLAGS_X86_LINUX = $(add_includes_x86_linux) +AM_CPPFLAGS_X86_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_x86=1 \ + -DVGO_linux=1 \ + -DVGP_x86_linux=1 AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@ -AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) +AM_CPPFLAGS_AMD64_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_amd64=1 \ + -DVGO_linux=1 \ + -DVGP_amd64_linux=1 AM_CFLAGS_AMD64_LINUX = $(WERROR) @FLAG_M64@ -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) @FLAG_M64@ -g AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@ -AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) +AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc32=1 \ + -DVGO_linux=1 \ + -DVGP_ppc32_linux=1 AM_CFLAGS_PPC32_LINUX = $(WERROR) @FLAG_M32@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) -Wa,-maltivec @FLAG_M32@ -g AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@ -AM_CPPFLAGS_PPC64_LINUX = $(add_includes_ppc64_linux) +AM_CPPFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc64=1 \ + -DVGO_linux=1 \ + -DVGP_ppc64_linux=1 AM_CFLAGS_PPC64_LINUX = $(WERROR) @FLAG_M64@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_LINUX = $(add_includes_ppc64_linux) -Wa,-maltivec @FLAG_M64@ -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ -AM_CPPFLAGS_PPC32_AIX5 = $(add_includes_ppc32_aix5) +AM_CPPFLAGS_PPC32_AIX5 = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc32=1 \ + -DVGO_aix5=1 \ + -DVGP_ppc32_aix5=1 AM_CFLAGS_PPC32_AIX5 = $(WERROR) @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_AIX5 = $(add_includes_ppc32_aix5) \ @FLAG_MAIX32@ -mcpu=powerpc -g AM_FLAG_M3264_PPC64_AIX5 = @FLAG_MAIX64@ -AM_CPPFLAGS_PPC64_AIX5 = $(add_includes_ppc64_aix5) +AM_CPPFLAGS_PPC64_AIX5 = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc64=1 \ + -DVGO_aix5=1 \ + -DVGP_ppc64_aix5=1 AM_CFLAGS_PPC64_AIX5 = $(WERROR) @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_AIX5 = $(add_includes_ppc64_aix5) \ @FLAG_MAIX64@ -mcpu=powerpc64 -g diff --git a/Makefile.tool.am b/Makefile.tool.am index a1a193424b..b02ee377c5 100644 --- a/Makefile.tool.am +++ b/Makefile.tool.am @@ -6,40 +6,6 @@ include $(top_srcdir)/Makefile.flags.am include $(top_srcdir)/Makefile.install.am include $(top_srcdir)/Makefile.tool-inplace.am -add_includes_COMMON = \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub - -add_includes_x86_linux = $(add_includes_COMMON) \ - -DVGA_x86=1 \ - -DVGO_linux=1 \ - -DVGP_x86_linux=1 - -add_includes_amd64_linux = $(add_includes_COMMON) \ - -DVGA_amd64=1 \ - -DVGO_linux=1 \ - -DVGP_amd64_linux=1 - -add_includes_ppc32_linux = $(add_includes_COMMON) \ - -DVGA_ppc32=1 \ - -DVGO_linux=1 \ - -DVGP_ppc32_linux=1 - -add_includes_ppc64_linux = $(add_includes_COMMON) \ - -DVGA_ppc64=1 \ - -DVGO_linux=1 \ - -DVGP_ppc64_linux=1 - -add_includes_ppc32_aix5 = $(add_includes_COMMON) \ - -DVGA_ppc32=1 \ - -DVGO_aix5=1 \ - -DVGP_ppc32_aix5=1 - -add_includes_ppc64_aix5 = $(add_includes_COMMON) \ - -DVGA_ppc64=1 \ - -DVGO_aix5=1 \ - -DVGP_ppc64_aix5=1 - LIBREPLACEMALLOC_X86_LINUX = \ $(top_builddir)/coregrind/libreplacemalloc_toolpreload_x86_linux.a diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am index 9e5fd1e1ef..d399db537f 100644 --- a/auxprogs/Makefile.am +++ b/auxprogs/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.all.am -include $(top_srcdir)/Makefile.core.am +include $(top_srcdir)/Makefile.flags.am bin_PROGRAMS = valgrind-listener @@ -20,7 +20,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) # valgrind_listener_SOURCES = valgrind-listener.c -valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) +valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI) valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI) diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index b0a036c51f..d7963414bc 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -5,19 +5,31 @@ # the names of noinst_LIBRARIES or noinst_PROGRAMS change 'shape'. include $(top_srcdir)/Makefile.all.am -include $(top_srcdir)/Makefile.core.am +include $(top_srcdir)/Makefile.flags.am include $(top_srcdir)/Makefile.install.am -AM_CPPFLAGS_X86_LINUX += -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_AMD64_LINUX += -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_PPC32_LINUX += -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_PPC64_LINUX += -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_PPC32_AIX5 += -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_PPC64_AIX5 += -DVG_LIBDIR="\"$(valdir)"\" + +AM_CPPFLAGS_CORE_COMMON = \ + -I$(top_srcdir)/coregrind \ + -DVG_LIBDIR="\"$(valdir)"\" + +AM_CPPFLAGS_X86_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-linux\"" +AM_CPPFLAGS_AMD64_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-linux\"" +AM_CPPFLAGS_PPC32_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-linux\"" +AM_CPPFLAGS_PPC64_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-linux\"" +AM_CPPFLAGS_PPC32_AIX5 += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-aix5\"" +AM_CPPFLAGS_PPC64_AIX5 += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-aix5\"" default.supp: $(SUPP_FILES) + noinst_LIBRARIES = if VGCONF_PLATFORMS_INCLUDE_X86_LINUX noinst_LIBRARIES += libcoregrind_x86_linux.a libreplacemalloc_toolpreload_x86_linux.a @@ -38,6 +50,7 @@ if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 noinst_LIBRARIES += libcoregrind_ppc64_aix5.a libreplacemalloc_toolpreload_ppc64_aix5.a endif + #------------------------- launcher ----------------------- # Build the launcher (valgrind) for the primary target only. # diff --git a/coregrind/launcher-linux.c b/coregrind/launcher-linux.c index 668425595b..d7ed224eda 100644 --- a/coregrind/launcher-linux.c +++ b/coregrind/launcher-linux.c @@ -239,14 +239,11 @@ int main(int argc, char** argv, char** envp) target, because on most ppc64-linux setups, the basic /bin, /usr/bin, etc, stuff is built in 32-bit mode, not 64-bit mode. */ - if (0==strcmp(VG_PLATFORM,"x86-linux")) - default_platform = "x86-linux"; - else if (0==strcmp(VG_PLATFORM,"amd64-linux")) - default_platform = "amd64-linux"; - else if (0==strcmp(VG_PLATFORM,"ppc32-linux")) - default_platform = "ppc32-linux"; - else if (0==strcmp(VG_PLATFORM,"ppc64-linux")) - default_platform = "ppc32-linux"; + if ((0==strcmp(VG_PLATFORM,"x86-linux")) || + (0==strcmp(VG_PLATFORM,"amd64-linux")) || + (0==strcmp(VG_PLATFORM,"ppc32-linux")) || + (0==strcmp(VG_PLATFORM,"ppc64-linux"))) + default_platform = VG_PLATFORM"ppc32-linux"; else barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM);