|
From: <sv...@va...> - 2009-02-06 04:59:39
|
Author: njn
Date: 2009-02-06 04:59:35 +0000 (Fri, 06 Feb 2009)
New Revision: 9115
Log:
Merged r9114 (remove Makefile.core.am) from trunk. Also changed some uses
of -gstabs to -g, because soon we won't be using stabs for Valgrind on Darwin.
Removed:
branches/DARWIN/Makefile.core.am
Modified:
branches/DARWIN/Makefile.flags.am
branches/DARWIN/Makefile.tool.am
branches/DARWIN/auxprogs/Makefile.am
branches/DARWIN/coregrind/Makefile.am
branches/DARWIN/coregrind/launcher-darwin.c
branches/DARWIN/coregrind/launcher-linux.c
Deleted: branches/DARWIN/Makefile.core.am
===================================================================
--- branches/DARWIN/Makefile.core.am 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/Makefile.core.am 2009-02-06 04:59:35 UTC (rev 9115)
@@ -1,54 +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
-
-add_includes_x86_darwin = $(add_includes_COMMON) \
- -DVG_PLATFORM="\"x86-darwin\"" \
- -DVGA_x86=1 \
- -DVGO_darwin=1 \
- -DVGP_x86_darwin=1
-
-add_includes_amd64_darwin = $(add_includes_COMMON) \
- -DVG_PLATFORM="\"amd64-darwin\"" \
- -DVGA_amd64=1 \
- -DVGO_darwin=1 \
- -DVGP_amd64_darwin=1
-
-include $(top_srcdir)/Makefile.flags.am
Modified: branches/DARWIN/Makefile.flags.am
===================================================================
--- branches/DARWIN/Makefile.flags.am 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/Makefile.flags.am 2009-02-06 04:59:35 UTC (rev 9115)
@@ -18,52 +18,85 @@
AM_CFLAGS_PIC = $(AM_PIC_FLAG) -g -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
AM_FLAG_M3264_X86_DARWIN = -arch i386
-AM_CPPFLAGS_X86_DARWIN = $(add_includes_x86_darwin)
-AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) -O2 -mmacosx-version-min=10.5 -gstabs -fno-stack-protector
+AM_CPPFLAGS_X86_DARWIN = $(AM_CPPFLAGS_COMMON) \
+ -DVGA_x86=1 \
+ -DVGO_darwin=1 \
+ -DVGP_x86_darwin=1
+AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
+ -mmacosx-version-min=10.5 -fno-stack-protector
# GrP fixme -O0 for debugging goes here; -O3 crashes
-AM_CCASFLAGS_X86_DARWIN = $(add_includes_x86_darwin) -arch i386 -gstabs -O0
+# [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_FLAG_M3264_AMD64_DARWIN = -arch x86_64
-AM_CPPFLAGS_AMD64_DARWIN = $(add_includes_amd64_darwin)
-AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) -O2 -mmacosx-version-min=10.5 -gstabs -fno-stack-protector
+AM_CPPFLAGS_AMD64_DARWIN = $(AM_CPPFLAGS_COMMON) \
+ -DVGA_amd64=1 \
+ -DVGO_linux=1 \
+ -DVGP_amd64_linux=1
+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 -gstabs
+AM_CCASFLAGS_AMD64_DARWIN = $(add_includes_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
Modified: branches/DARWIN/Makefile.tool.am
===================================================================
--- branches/DARWIN/Makefile.tool.am 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/Makefile.tool.am 2009-02-06 04:59:35 UTC (rev 9115)
@@ -6,51 +6,7 @@
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
-
-add_includes_x86_darwin = $(add_includes_COMMON) \
- -DVGA_x86=1 \
- -DVGO_darwin=1 \
- -DVGP_x86_darwin=1
-
-add_includes_amd64_darwin = $(add_includes_COMMON) \
- -DVGA_amd64=1 \
- -DVGO_darwin=1 \
- -DVGP_amd64_darwin=1
-
-
LIBREPLACEMALLOC_X86_LINUX = \
$(top_builddir)/coregrind/libreplacemalloc_toolpreload_x86_linux.a
Modified: branches/DARWIN/auxprogs/Makefile.am
===================================================================
--- branches/DARWIN/auxprogs/Makefile.am 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/auxprogs/Makefile.am 2009-02-06 04:59:35 UTC (rev 9115)
@@ -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 @@
#
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)
Modified: branches/DARWIN/coregrind/Makefile.am
===================================================================
--- branches/DARWIN/coregrind/Makefile.am 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/coregrind/Makefile.am 2009-02-06 04:59:35 UTC (rev 9115)
@@ -5,21 +5,41 @@
# 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_X86_DARWIN += -DVG_LIBDIR="\"$(valdir)"\"
-AM_CPPFLAGS_AMD64_DARWIN += -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\""
+
+AM_CPPFLAGS_X86_DARWIN += \
+ $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-darwin\""
+
+AM_CPPFLAGS_AMD64_DARWIN += \
+ $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-darwin\""
+
+
default.supp: $(SUPP_FILES)
+
noinst_LIBRARIES =
if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_LIBRARIES += libcoregrind_x86_linux.a libreplacemalloc_toolpreload_x86_linux.a
@@ -46,6 +66,7 @@
noinst_LIBRARIES += libcoregrind_amd64_darwin.a libreplacemalloc_toolpreload_amd64_darwin.a
endif
+
#------------------------- launcher -----------------------
# Build the launcher (valgrind) for the primary target only.
#
Modified: branches/DARWIN/coregrind/launcher-darwin.c
===================================================================
--- branches/DARWIN/coregrind/launcher-darwin.c 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/coregrind/launcher-darwin.c 2009-02-06 04:59:35 UTC (rev 9115)
@@ -291,7 +291,7 @@
free(tooldir);
}
- /* Find the "default" arch (VG_PLATFORM_PRI from configure).
+ /* Find the "default" arch (VGCONF_ARCH_PRI from configure).
This is the preferred arch from fat files and the fallback. */
default_arch = NULL;
default_cputype = 0;
Modified: branches/DARWIN/coregrind/launcher-linux.c
===================================================================
--- branches/DARWIN/coregrind/launcher-linux.c 2009-02-06 04:49:14 UTC (rev 9114)
+++ branches/DARWIN/coregrind/launcher-linux.c 2009-02-06 04:59:35 UTC (rev 9115)
@@ -239,14 +239,11 @@
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);
|