|
From: <sv...@va...> - 2009-01-22 22:36:11
|
Author: njn
Date: 2009-01-22 22:36:02 +0000 (Thu, 22 Jan 2009)
New Revision: 9033
Log:
Merged r9031 (rename all the arch/OS/platform configure variables) from
trunk.
Removed:
branches/DARWIN/cachegrind/tests/amd64/
branches/DARWIN/cachegrind/tests/ppc32/
branches/DARWIN/cachegrind/tests/ppc64/
branches/DARWIN/memcheck/tests/ppc32/
branches/DARWIN/memcheck/tests/ppc64/
Modified:
branches/DARWIN/Makefile.am
branches/DARWIN/Makefile.flags.am
branches/DARWIN/auxprogs/Makefile.am
branches/DARWIN/cachegrind/Makefile.am
branches/DARWIN/cachegrind/tests/Makefile.am
branches/DARWIN/callgrind/Makefile.am
branches/DARWIN/configure.in
branches/DARWIN/coregrind/Makefile.am
branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
branches/DARWIN/docs/internals/multiple-architectures.txt
branches/DARWIN/docs/internals/porting-HOWTO.txt
branches/DARWIN/drd/Makefile.am
branches/DARWIN/drd/tests/Makefile.am
branches/DARWIN/exp-omega/Makefile.am
branches/DARWIN/exp-ptrcheck/Makefile.am
branches/DARWIN/exp-ptrcheck/tests/Makefile.am
branches/DARWIN/helgrind/Makefile.am
branches/DARWIN/helgrind/tests/Makefile.am
branches/DARWIN/lackey/Makefile.am
branches/DARWIN/massif/Makefile.am
branches/DARWIN/memcheck/Makefile.am
branches/DARWIN/memcheck/tests/Makefile.am
branches/DARWIN/memcheck/tests/x86/Makefile.am
branches/DARWIN/none/Makefile.am
branches/DARWIN/none/tests/Makefile.am
branches/DARWIN/none/tests/x86/Makefile.am
branches/DARWIN/none/tests/x86/yield.c
branches/DARWIN/tests/Makefile.am
branches/DARWIN/tests/cputest.c
branches/DARWIN/valgrind.pc.in
Modified: branches/DARWIN/Makefile.am
===================================================================
--- branches/DARWIN/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -43,31 +43,31 @@
CLEANFILES =
DISTCLEANFILES = default.supp
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
BUILT_SOURCES += valt_load_address_x86_linux.lds
CLEANFILES += valt_load_address_x86_linux.lds
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
BUILT_SOURCES += valt_load_address_amd64_linux.lds
CLEANFILES += valt_load_address_amd64_linux.lds
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
BUILT_SOURCES += valt_load_address_ppc32_linux.lds
CLEANFILES += valt_load_address_ppc32_linux.lds
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
BUILT_SOURCES += valt_load_address_ppc64_linux.lds
CLEANFILES += valt_load_address_ppc64_linux.lds
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
# No need to generate valt_load_address*.lds; the final executables
# can be linked to be at any address. They will be relocated by
# AIX kernel when they are loaded.
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
# Ditto
endif
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
# GrP untested, possibly hopeless
endif
Modified: branches/DARWIN/Makefile.flags.am
===================================================================
--- branches/DARWIN/Makefile.flags.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/Makefile.flags.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -10,7 +10,7 @@
# The aim is to give reasonable performance but also to have good
# stack traces, since users often see stack traces extending
# into (and through) the preloads.
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
AM_PIC_FLAG = -dynamic
else
AM_PIC_FLAG = -fpic
@@ -69,13 +69,13 @@
# regtests and performance tests. In fact, these must be used to
# build anything which is built only once on a dual-arch build.
#
-AM_FLAG_M3264_PRI = $(AM_FLAG_M3264_@VG_PLATFORM_PRI@)
-AM_CPPFLAGS_PRI = $(AM_CPPFLAGS_@VG_PLATFORM_PRI@)
-AM_CFLAGS_PRI = $(AM_CFLAGS_@VG_PLATFORM_PRI@)
-AM_CCASFLAGS_PRI = $(AM_CCASFLAGS_@VG_PLATFORM_PRI@)
+AM_FLAG_M3264_PRI = $(AM_FLAG_M3264_@VGCONF_PLATFORM_PRI_CAPS@)
+AM_CPPFLAGS_PRI = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
+AM_CFLAGS_PRI = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
+AM_CCASFLAGS_PRI = $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-if VGP_HAVE_SECONDARY
- AM_FLAG_M3264_SEC = $(AM_FLAG_M3264_@VG_PLATFORM_SEC@)
+if VGCONF_HAVE_PLATFORM_SEC_CAPS
+ AM_FLAG_M3264_SEC = $(AM_FLAG_M3264_@VGCONF_PLATFORM_SEC_CAPS@)
else
AM_FLAG_M3264_SEC =
endif
Modified: branches/DARWIN/auxprogs/Makefile.am
===================================================================
--- branches/DARWIN/auxprogs/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/auxprogs/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -42,7 +42,7 @@
# directly saying how to build libmpiwrap-*.so, instead of
# using automake's standard gunk.
#
-if VGO_AIX5
+if VGCONF_OS_IS_AIX5
HACKY_FLAGS_PRI = -g -O -bE:libmpiwrap_aix5.exp -bM:SRE -bnoentry \
-qflag=w:w -qlanglvl=extended \
`echo $(AM_FLAG_M3264_PRI) | sed s/maix/q/g`
@@ -50,7 +50,7 @@
-qflag=w:w -qlanglvl=extended \
`echo $(AM_FLAG_M3264_SEC) | sed s/maix/q/g`
else
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
HACKY_FLAGS_PRI = -g -O -fno-omit-frame-pointer -Wall -dynamic \
-dynamiclib -all_load $(AM_FLAG_M3264_PRI)
HACKY_FLAGS_SEC = -g -O -fno-omit-frame-pointer -Wall -dynamic \
@@ -68,18 +68,18 @@
##
noinst_PROGRAMS =
if BUILD_MPIWRAP_PRI
-noinst_PROGRAMS += libmpiwrap-@VG_PLATFORM_PRI@.so
-libmpiwrap-@VG_PLATFORM_PRI@.so: libmpiwrap.c
+noinst_PROGRAMS += libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so
+libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so: libmpiwrap.c
$(MPI_CC) $(HACKY_FLAGS_PRI) \
-I../include \
- -o libmpiwrap-@VG_PLATFORM_PRI@.so libmpiwrap.c
+ -o libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so libmpiwrap.c
endif
if BUILD_MPIWRAP_SEC
-noinst_PROGRAMS += libmpiwrap-@VG_PLATFORM_SEC@.so
-libmpiwrap-@VG_PLATFORM_SEC@.so: libmpiwrap.c
+noinst_PROGRAMS += libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so
+libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so: libmpiwrap.c
$(MPI_CC) $(HACKY_FLAGS_SEC) \
-I../include \
- -o libmpiwrap-@VG_PLATFORM_SEC@.so libmpiwrap.c
+ -o libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so libmpiwrap.c
endif
@@ -93,19 +93,19 @@
if BUILD_MPIWRAP_PRI
# convert (eg) X86_LINUX to x86-linux
# really should use sed here, rather than assume tr is available
- pD=`echo @VG_PLATFORM_PRI@ | tr A-Z_ a-z-` ; \
+ pD=`echo @VGCONF_PLATFORM_PRI_CAPS@ | tr A-Z_ a-z-` ; \
$(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD; \
rm -f ./libmpiwrap.so; \
- cp ./libmpiwrap-@VG_PLATFORM_PRI@.so ./libmpiwrap.so; \
+ cp ./libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.so ./libmpiwrap.so; \
$(INSTALL_PROGRAM) ./libmpiwrap.so \
$(DESTDIR)$(valdir)/$$pD; \
rm -f ./libmpiwrap.so
endif
if BUILD_MPIWRAP_SEC
- pD=`echo @VG_PLATFORM_SEC@ | tr A-Z_ a-z-` ; \
+ pD=`echo @VGCONF_PLATFORM_SEC_CAPS@ | tr A-Z_ a-z-` ; \
$(mkinstalldirs) $(DESTDIR)$(valdir)/$$pD; \
rm -f ./libmpiwrap.so; \
- cp ./libmpiwrap-@VG_PLATFORM_SEC@.so ./libmpiwrap.so; \
+ cp ./libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.so ./libmpiwrap.so; \
$(INSTALL_PROGRAM) ./libmpiwrap.so \
$(DESTDIR)$(valdir)/$$pD; \
rm -f ./libmpiwrap.so
@@ -116,27 +116,28 @@
## It would seem that using nodist_SOURCES is the right fix, but
## I can't figure out how to do it.
##
-#nodist_SOURCES = libmpiwrap-@VG_PLATFORM_PRI@.c
-#nodist_SOURCES = libmpiwrap-@VG_PLATFORM_SEC@.c
+#nodist_SOURCES = libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c
+#nodist_SOURCES = libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
libmpiwrap-.c:
rm -f libmpiwrap-.c
touch libmpiwrap-.c
-libmpiwrap-@VG_PLATFORM_PRI@.c:
- rm -f libmpiwrap-@VG_PLATFORM_PRI@.c
- touch libmpiwrap-@VG_PLATFORM_PRI@.c
+libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c:
+ rm -f libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c
+ touch libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c
-if VGP_HAVE_SECONDARY
-libmpiwrap-@VG_PLATFORM_SEC@.c:
- rm -f libmpiwrap-@VG_PLATFORM_SEC@.c
- touch libmpiwrap-@VG_PLATFORM_SEC@.c
+if VGCONF_HAVE_PLATFORM_SEC_CAPS
+libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c:
+ rm -f libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
+ touch libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
endif
## cleanery
clean-local:
rm -f libmpiwrap-.c \
- libmpiwrap-@VG_PLATFORM_PRI@.c libmpiwrap-@VG_PLATFORM_SEC@.c
+ libmpiwrap-@VGCONF_PLATFORM_PRI_CAPS@.c \
+ libmpiwrap-@VGCONF_PLATFORM_SEC_CAPS@.c
#
#----------------------------------------------------------
Modified: branches/DARWIN/cachegrind/Makefile.am
===================================================================
--- branches/DARWIN/cachegrind/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/cachegrind/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -5,28 +5,28 @@
noinst_HEADERS = cg_arch.h cg_sim.c cg_branchpred.c
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += cachegrind-x86-linux
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += cachegrind-amd64-linux
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += cachegrind-ppc32-linux
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += cachegrind-ppc64-linux
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += cachegrind-ppc32-aix5
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += cachegrind-ppc64-aix5
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += cachegrind-x86-darwin
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += cachegrind-amd64-darwin
endif
Modified: branches/DARWIN/cachegrind/tests/Makefile.am
===================================================================
--- branches/DARWIN/cachegrind/tests/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/cachegrind/tests/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -3,32 +3,11 @@
include $(top_srcdir)/Makefile.flags.am
SUBDIRS = .
-if VGP_X86_LINUX
+if VGCONF_ARCHS_INCLUDE_X86
SUBDIRS += x86
endif
-if VGP_AMD64_LINUX
-SUBDIRS += amd64
-endif
-if VGP_PPC32_LINUX
-SUBDIRS += ppc32
-endif
-if VGP_PPC64_LINUX
-SUBDIRS += ppc64
-endif
-if VGP_X86_DARWIN
-SUBDIRS += x86
-endif
-if VGP_AMD64_DARWIN
-SUBDIRS += amd64
-endif
-if VGP_PPC32_DARWIN
-SUBDIRS += ppc32
-endif
-if VGP_PPC64_DARWIN
-SUBDIRS += ppc64
-endif
-DIST_SUBDIRS = ${VG_ARCH_ALL} .
+DIST_SUBDIRS = x86 .
noinst_SCRIPTS = filter_stderr filter_cachesim_discards
@@ -47,7 +26,7 @@
# C ones
dlclose_LDADD = -ldl
myprint_so_SOURCES = myprint.c
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -dynamic -dynamiclib -all_load -fpic
else
myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -shared -fPIC
Modified: branches/DARWIN/callgrind/Makefile.am
===================================================================
--- branches/DARWIN/callgrind/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/callgrind/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -5,28 +5,28 @@
noinst_HEADERS = global.h costs.h events.h
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += callgrind-x86-linux
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += callgrind-amd64-linux
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += callgrind-ppc32-linux
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += callgrind-ppc64-linux
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += callgrind-ppc32-aix5
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += callgrind-ppc64-aix5
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += callgrind-x86-darwin
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += callgrind-amd64-darwin
endif
Modified: branches/DARWIN/configure.in
===================================================================
--- branches/DARWIN/configure.in 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/configure.in 2009-01-22 22:36:02 UTC (rev 9033)
@@ -15,7 +15,9 @@
AM_MAINTAINER_MODE
+#----------------------------------------------------------------------------
# Where is VEX ?
+#----------------------------------------------------------------------------
# Nb: For the 2nd arg, the help string, AS_HELP_STRING is the proper way, but
# older autoconfs don't support it... here's what it would say:
#
@@ -50,7 +52,9 @@
# place.
AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], [--with-vex=$VEX_DIR])
-# Checks for programs.
+#----------------------------------------------------------------------------
+# Checks for various programs.
+#----------------------------------------------------------------------------
CFLAGS="-Wno-long-long"
AC_PROG_LN_S
@@ -126,54 +130,49 @@
;;
esac
+#----------------------------------------------------------------------------
+# Arch/OS/platform tests.
+#----------------------------------------------------------------------------
+# We create a number of arch/OS/platform-related variables. We prefix them
+# all with "VGCONF_" which indicates that they are defined at
+# configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_*
+# variables used when compiling C files.
-# Checks for the platform, with the aim of setting VG_ARCH_MAX. Note
-# that VG_ARCH_MAX must be set to reflect the most that this CPU can
-# do: for example if it is a 64-bit capable PowerPC, then it must be
-# set to ppc64 and not ppc32. Ditto for amd64.
-#
-# We will later in this file set VG_ARCH_PRI, which is the arch for
-# the primary target. For example, suppose we do a build on an amd64
-# machine, but --enable-only32bit has been requested. Then
-# VG_ARCH_MAX will be "amd64" since that reflects the most that this
-# cpu can do, but VG_ARCH_PRI will be "x86", since that reflects the
-# arch corresponding to the primary build (VG_PLATFORM_PRI).
-
AC_CANONICAL_HOST
AC_MSG_CHECKING([for a supported CPU])
-AC_SUBST(VG_ARCH_MAX)
-AC_SUBST(VG_ARCH_ALL)
-VG_ARCH_ALL="amd64 ppc32 ppc64 x86"
-
+# ARCH_MAX reflects the most that this CPU can do: for example if it
+# is a 64-bit capable PowerPC, then it must be set to ppc64 and not ppc32.
+# Ditto for amd64. It is used for more configuration below, but is not used
+# outside this file.
case "${host_cpu}" in
i?86)
AC_MSG_RESULT([ok (${host_cpu})])
- VG_ARCH_MAX="x86"
+ ARCH_MAX="x86"
;;
x86_64)
AC_MSG_RESULT([ok (${host_cpu})])
- VG_ARCH_MAX="amd64"
+ ARCH_MAX="amd64"
;;
powerpc64)
-# This value can only happen on Linux, not on AIX
+ # This value can only happen on Linux, not on AIX
AC_MSG_RESULT([ok (${host_cpu})])
- VG_ARCH_MAX="ppc64"
+ ARCH_MAX="ppc64"
;;
powerpc)
-# Complexity. 'powerpc' on AIX implies a 64-bit capable CPU.
-# Whereas in Linux that means only a 32-bit capable CPU.
+ # Complexity. 'powerpc' on AIX implies a 64-bit capable CPU.
+ # Whereas in Linux that means only a 32-bit capable CPU.
AC_MSG_RESULT([ok (${host_cpu})])
case "${host_os}" in
aix5.*)
- VG_ARCH_MAX="ppc64"
+ ARCH_MAX="ppc64"
;;
*)
- VG_ARCH_MAX="ppc32"
+ ARCH_MAX="ppc32"
;;
esac
;;
@@ -184,10 +183,15 @@
;;
esac
+#----------------------------------------------------------------------------
+
# Sometimes it's convenient to subvert the bi-arch build system and
# just have a single build even though the underlying platform is
# capable of both. Hence handle --enable-only64bit and
# --enable-only32bit. Complain if both are issued :-)
+# [Actually, if either of these options are used, I think both get built,
+# but only one gets installed. So if you use an in-place build, both can be
+# used. --njn]
# Check if a 64-bit only build has been requested
AC_CACHE_CHECK([for a 64-bit only build], vg_cv_only64bit,
@@ -209,19 +213,21 @@
[Nonsensical: both --enable-only64bit and --enable-only32bit.])
fi
+#----------------------------------------------------------------------------
-# This variable will collect the individual suppression files
-# depending on the results of autoconf
+# VGCONF_OS is the primary build OS. It is passed in to compilation of many
+# C files via -VGO_$(VGCONF_OS) and -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS).
+AC_MSG_CHECKING([for a supported OS])
+AC_SUBST(VGCONF_OS)
+
+# DDD: why are the Darwin supps set in the kernel check instead of the libc
+# check?
DEFAULT_SUPP=""
-AC_SUBST(DEFAULT_SUPP)
-AC_MSG_CHECKING([for a supported OS])
-AC_SUBST(VG_OS)
-
case "${host_os}" in
*linux*)
AC_MSG_RESULT([ok (${host_os})])
- VG_OS="linux"
+ VGCONF_OS="linux"
# Ok, this is linux. Check the kernel version
AC_MSG_CHECKING([for the kernel version])
@@ -249,20 +255,20 @@
aix5.1.*)
AC_MSG_RESULT([ok (${host_os})])
- VG_OS="aix5"
+ VGCONF_OS="aix5"
;;
aix5.2.*)
AC_MSG_RESULT([ok (${host_os})])
- VG_OS="aix5"
+ VGCONF_OS="aix5"
;;
aix5.3.*)
AC_MSG_RESULT([ok (${host_os})])
- VG_OS="aix5"
+ VGCONF_OS="aix5"
;;
*freebsd*)
AC_MSG_RESULT([ok (${host_os})])
- VG_OS="freebsd"
+ VGCONF_OS="freebsd"
;;
*darwin*)
@@ -291,11 +297,13 @@
;;
esac
+#----------------------------------------------------------------------------
+
# If we are building on a 64 bit platform test to see if the system
# supports building 32 bit programs and disable 32 bit support if it
# does not support building 32 bit programs
-case "$VG_ARCH_MAX-$VG_OS" in
+case "$ARCH_MAX-$VGCONF_OS" in
amd64-linux|ppc64-linux)
AC_MSG_CHECKING([for 32 bit build support])
safe_CFLAGS=$CFLAGS
@@ -317,72 +325,86 @@
[--enable-only32bit was specified but system does not support 32 bit builds])
fi
-# Establish VG_PLATFORM_PRI. This is the primary build target. The
-# entire system, including regression and performance tests, will be
-# built for this target.
+#----------------------------------------------------------------------------
+
+# VGCONF_ARCH_PRI is the arch for the primary build target. By default it's
+# the same as ARCH_MAX. But if, say, we do a build on an amd64 machine, but
+# --enable-only32bit has been requested, then ARCH_MAX (see above) will be
+# "amd64" since that reflects the most that this cpu can do, but
+# VGCONF_ARCH_PRI will be downgraded to "x86", since that reflects the arch
+# corresponding to the primary build (VGCONF_PLATFORM_PRI_CAPS). It is
+# passed in to compilation of many C files via -VGA_$(VGCONF_ARCH_PRI) and
+# -VGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS).
+AC_SUBST(VGCONF_ARCH_PRI)
+
+# VGCONF_PLATFORM_PRI_CAPS is the primary build target. The entire system,
+# including regression and performance tests, will be built for this target.
+# The "_CAPS" indicates that the name is in capital letters, because it's
+# used to create various Makefile variables, which are all in caps by
+# convention. This is in contrast to VGCONF_ARCH_PRI and VGCONF_OS which
+# are not in caps.
+AC_SUBST(VGCONF_PLATFORM_PRI_CAPS)
+
+# VGCONF_PLATFORM_SEC_CAPS is the secondary build target, if there is one.
+# Valgrind and tools will also be built for this target, but not the
+# regression or performance tests.
#
-# Also establish VG_PLATFORM_SEC, the secondary build target, if
-# possible. The system will also be built for this target, but not
-# the regression or performance tests.
-#
-# Also establish VG_ARCH_PRI, which is the arch for the primary
-# build target. The various makefiles building regression tests
-# sometimes need to see this.
+# By default, the primary arch is the same as the "max" arch, as commented
+# above (at the definition of ARCH_MAX). We may choose to downgrade it in
+# the big case statement just below here, in the case where we're building
+# on a 64 bit machine but have been requested only to do a 32 bit build.
+AC_SUBST(VGCONF_PLATFORM_SEC_CAPS)
+
AC_MSG_CHECKING([for a supported CPU/OS combination])
-AC_SUBST(VG_PLATFORM_PRI)
-AC_SUBST(VG_PLATFORM_SEC)
-AC_SUBST(VG_ARCH_PRI)
-
-# By default, the primary arch is the same as the "max" arch, as
-# commented above (at the definition of VG_ARCH_MAX). We may choose
-# to downgrade it in the big case statement just below here, in the
-# case where we're building on a 64 bit machine but have been
-# requested only to do a 32 bit build.
-VG_ARCH_PRI=$VG_ARCH_MAX
-
-case "$VG_ARCH_MAX-$VG_OS" in
+case "$ARCH_MAX-$VGCONF_OS" in
x86-linux)
- VG_PLATFORM_PRI="X86_LINUX"
- VG_PLATFORM_SEC=""
+ VGCONF_ARCH_PRI="x86"
+ VGCONF_PLATFORM_PRI_CAPS="X86_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
valt_load_address_normal="0x38000000"
valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
amd64-linux)
if test x$vg_cv_only64bit = xyes; then
- VG_PLATFORM_PRI="AMD64_LINUX"
- VG_PLATFORM_SEC=""
+ VGCONF_ARCH_PRI="amd64"
+ VGCONF_PLATFORM_PRI_CAPS="AMD64_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
elif test x$vg_cv_only32bit = xyes; then
- VG_PLATFORM_PRI="X86_LINUX"
- VG_PLATFORM_SEC=""
- VG_ARCH_PRI="x86"
+ VGCONF_ARCH_PRI="x86"
+ VGCONF_PLATFORM_PRI_CAPS="X86_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
else
- VG_PLATFORM_PRI="AMD64_LINUX"
- VG_PLATFORM_SEC="X86_LINUX"
+ VGCONF_ARCH_PRI="amd64"
+ VGCONF_PLATFORM_PRI_CAPS="AMD64_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS="X86_LINUX"
fi
valt_load_address_normal="0x38000000"
valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
ppc32-linux)
- VG_PLATFORM_PRI="PPC32_LINUX"
- VG_PLATFORM_SEC=""
+ VGCONF_ARCH_PRI="ppc32"
+ VGCONF_PLATFORM_PRI_CAPS="PPC32_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
valt_load_address_normal="0x38000000"
valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
ppc64-aix5)
if test x$vg_cv_only64bit = xyes; then
- VG_PLATFORM_PRI="PPC64_AIX5"
- VG_PLATFORM_SEC=""
+ VGCONF_ARCH_PRI="ppc64"
+ VGCONF_PLATFORM_PRI_CAPS="PPC64_AIX5"
+ VGCONF_PLATFORM_SEC_CAPS=""
elif test x$vg_cv_only32bit = xyes; then
- VG_PLATFORM_PRI="PPC32_AIX5"
- VG_PLATFORM_SEC=""
- VG_ARCH_PRI="ppc32"
+ VGCONF_ARCH_PRI="ppc32"
+ VGCONF_PLATFORM_PRI_CAPS="PPC32_AIX5"
+ VGCONF_PLATFORM_SEC_CAPS=""
else
- VG_PLATFORM_PRI="PPC64_AIX5"
- VG_PLATFORM_SEC="PPC32_AIX5"
+ VGCONF_ARCH_PRI="ppc64"
+ VGCONF_PLATFORM_PRI_CAPS="PPC64_AIX5"
+ VGCONF_PLATFORM_SEC_CAPS="PPC32_AIX5"
fi
valt_load_address_normal="0x38000000"
valt_load_address_inner="0x28000000"
@@ -390,15 +412,18 @@
;;
ppc64-linux)
if test x$vg_cv_only64bit = xyes; then
- VG_PLATFORM_PRI="PPC64_LINUX"
- VG_PLATFORM_SEC=""
+ VGCONF_ARCH_PRI="ppc64"
+ VGCONF_PLATFORM_PRI_CAPS="PPC64_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
elif test x$vg_cv_only32bit = xyes; then
- VG_PLATFORM_PRI="PPC32_LINUX"
- VG_PLATFORM_SEC=""
- VG_ARCH_PRI="ppc32"
+ VGCONF_ARCH_PRI="ppc32"
+ VGCONF_PLATFORM_PRI_CAPS="PPC32_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS=""
+ VGCONF_ARCH_PRI="ppc32"
else
- VG_PLATFORM_PRI="PPC64_LINUX"
- VG_PLATFORM_SEC="PPC32_LINUX"
+ VGCONF_ARCH_PRI="ppc64"
+ VGCONF_PLATFORM_PRI_CAPS="PPC64_LINUX"
+ VGCONF_PLATFORM_SEC_CAPS="PPC32_LINUX"
fi
valt_load_address_normal="0x38000000"
valt_load_address_inner="0x28000000"
@@ -428,88 +453,96 @@
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
*)
- VG_PLATFORM_PRI="unknown"
- VG_PLATFORM_SEC="unknown"
+ VGCONF_ARCH_PRI="unknown"
+ VGCONF_PLATFORM_PRI_CAPS="UNKNOWN"
+ VGCONF_PLATFORM_SEC_CAPS="UNKNOWN"
AC_MSG_RESULT([no (${host_cpu}-${host_os})])
AC_MSG_ERROR([Valgrind is platform specific. Sorry. Please consider doing a port.])
;;
esac
-# Set up VGA_<arch>. Either one or two of these become defined.
-#
-AM_CONDITIONAL(VGA_X86,
- test x$VG_PLATFORM_PRI = xX86_LINUX \
- -o x$VG_PLATFORM_SEC = xX86_LINUX \
- -o x$VG_PLATFORM_PRI = xX86_DARWIN \
- -o x$VG_PLATFORM_SEC = xX86_DARWIN)
-AM_CONDITIONAL(VGA_AMD64,
- test x$VG_PLATFORM_PRI = xAMD64_LINUX \
- -o x$VG_PLATFORM_PRI = xAMD64_DARWIN)
-AM_CONDITIONAL(VGA_PPC32,
- test x$VG_PLATFORM_PRI = xPPC32_LINUX \
- -o x$VG_PLATFORM_SEC = xPPC32_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC32_AIX5 \
- -o x$VG_PLATFORM_SEC = xPPC32_AIX5 \
- -o x$VG_PLATFORM_PRI = xPPC32_DARWIN \
- -o x$VG_PLATFORM_SEC = xPPC32_DARWIN)
-AM_CONDITIONAL(VGA_PPC64,
- test x$VG_PLATFORM_PRI = xPPC64_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC64_AIX5 \
- -o x$VG_PLATFORM_PRI = xPPC64_DARWIN)
+#----------------------------------------------------------------------------
-# Set up VGP_<platform>. Either one or two of these become defined.
-#
-AM_CONDITIONAL(VGP_X86_LINUX,
- test x$VG_PLATFORM_PRI = xX86_LINUX \
- -o x$VG_PLATFORM_SEC = xX86_LINUX)
-AM_CONDITIONAL(VGP_AMD64_LINUX,
- test x$VG_PLATFORM_PRI = xAMD64_LINUX)
-AM_CONDITIONAL(VGP_PPC32_LINUX,
- test x$VG_PLATFORM_PRI = xPPC32_LINUX \
- -o x$VG_PLATFORM_SEC = xPPC32_LINUX)
-AM_CONDITIONAL(VGP_PPC64_LINUX,
- test x$VG_PLATFORM_PRI = xPPC64_LINUX)
-AM_CONDITIONAL(VGP_PPC32_AIX5,
- test x$VG_PLATFORM_PRI = xPPC32_AIX5 \
- -o x$VG_PLATFORM_SEC = xPPC32_AIX5)
-AM_CONDITIONAL(VGP_PPC64_AIX5,
- test x$VG_PLATFORM_PRI = xPPC64_AIX5)
-AM_CONDITIONAL(VGP_X86_DARWIN,
- test x$VG_PLATFORM_PRI = xX86_DARWIN)
-AM_CONDITIONAL(VGP_AMD64_DARWIN,
- test x$VG_PLATFORM_PRI = xAMD64_DARWIN)
-AM_CONDITIONAL(VGP_PPC32_DARWIN,
- test x$VG_PLATFORM_PRI = xPPC32_DARWIN \
- -o x$VG_PLATFORM_SEC = xPPC32_DARWIN)
-AM_CONDITIONAL(VGP_PPC64_DARWIN,
- test x$VG_PLATFORM_PRI = xPPC64_DARWIN)
+# Set up VGCONF_ARCHS_INCLUDE_<arch>. Either one or two of these become
+# defined.
+AM_CONDITIONAL(VGCONF_ARCHS_INCLUDE_X86,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xX86_LINUX \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xX86_LINUX \
+ -0 x$VGCONF_PLATFORM_PRI_CAPS = xX86_DARWIN \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xX86_DARWIN )
+AM_CONDITIONAL(VGCONF_ARCHS_INCLUDE_AMD64,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_DARWIN )
+AM_CONDITIONAL(VGCONF_ARCHS_INCLUDE_PPC32,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_LINUX \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_AIX5 \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_DARWIN \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_DARWIN )
+AM_CONDITIONAL(VGCONF_ARCHS_INCLUDE_PPC64,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5 \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_DARWIN )
-# Similarly, set up VGO_<os>. Exactly one of these becomes defined.
+# Set up VGCONF_PLATFORMS_INCLUDE_<platform>. Either one or two of these
+# become defined.
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_X86_LINUX,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xX86_LINUX \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xX86_LINUX)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_LINUX)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_LINUX \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_LINUX)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_LINUX)
+
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_AIX5)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5)
+
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_X86_DARWIN,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xX86_DARWIN)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_DARWIN)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC32_DARWIN,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_DARWIN \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_DARWIN)
+AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC64_DARWIN,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_DARWIN)
+
+
+# Similarly, set up VGCONF_OF_IS_<os>. Exactly one of these becomes defined.
# Relies on the assumption that the primary and secondary targets are
# for the same OS, so therefore only necessary to test the primary.
-#
-AM_CONDITIONAL(VGO_LINUX,
- test x$VG_PLATFORM_PRI = xX86_LINUX \
- -o x$VG_PLATFORM_PRI = xAMD64_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC32_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC64_LINUX)
-AM_CONDITIONAL(VGO_AIX5,
- test x$VG_PLATFORM_PRI = xPPC32_AIX5 \
- -o x$VG_PLATFORM_PRI = xPPC64_AIX5)
-AM_CONDITIONAL(VGO_DARWIN,
+AM_CONDITIONAL(VGCONF_OS_IS_LINUX,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xX86_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_LINUX)
+AM_CONDITIONAL(VGCONF_OS_IS_AIX5,
+ test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5)
+AM_CONDITIONAL(VGCONF_OS_IS_DARWIN,
test x$VG_PLATFORM_PRI = xX86_DARWIN \
-o x$VG_PLATFORM_PRI = xAMD64_DARWIN \
-o x$VG_PLATFORM_PRI = xPPC32_DARWIN \
-o x$VG_PLATFORM_PRI = xPPC64_DARWIN)
-# Sometimes, in the Makefile.am-s, it's useful to know
-# whether or not there is a secondary target.
-#
-AM_CONDITIONAL(VGP_HAVE_SECONDARY,
- test x$VG_PLATFORM_SEC != x)
+# Sometimes, in the Makefile.am files, it's useful to know whether or not
+# there is a secondary target.
+AM_CONDITIONAL(VGCONF_HAVE_PLATFORM_SEC_CAPS,
+ test x$VGCONF_PLATFORM_SEC_CAPS != x)
+#----------------------------------------------------------------------------
+# Inner Valgrind?
+#----------------------------------------------------------------------------
+
# Check if this should be built as an inner Valgrind, to be run within
# another Valgrind. Choose the load address accordingly.
AC_SUBST(VALT_LOAD_ADDRESS)
@@ -526,6 +559,12 @@
fi
+#----------------------------------------------------------------------------
+# Libc and suppressions
+#----------------------------------------------------------------------------
+# This variable will collect the suppression files to be used.
+AC_SUBST(DEFAULT_SUPP)
+
GLIBC_VERSION=""
AC_EGREP_CPP([GLIBC_22], [
@@ -719,6 +758,10 @@
DEFAULT_SUPP="exp-ptrcheck.supp ${DEFAULT_SUPP}"
+#----------------------------------------------------------------------------
+# Checking for various library functions and other definitions
+#----------------------------------------------------------------------------
+
# Check for CLOCK_MONOTONIC
AC_MSG_CHECKING([for CLOCK_MONOTONIC])
@@ -931,6 +974,10 @@
])
+#----------------------------------------------------------------------------
+# Checking for supported compiler flags.
+#----------------------------------------------------------------------------
+
# does this compiler support -m32 ?
AC_MSG_CHECKING([if gcc accepts -m32])
@@ -1360,13 +1407,18 @@
fi
+#----------------------------------------------------------------------------
# Check for /proc filesystem
+#----------------------------------------------------------------------------
AC_CHECK_FILES(/proc/self/fd /proc/self/exe /proc/self/maps,
[ AC_DEFINE([HAVE_PROC], 1, [can use /proc filesystem]) ],
[])
+#----------------------------------------------------------------------------
# Checks for C header files.
+#----------------------------------------------------------------------------
+
AC_HEADER_STDC
AC_CHECK_HEADERS([ \
asm/unistd.h \
@@ -1384,14 +1436,18 @@
sys/types.h \
])
+#----------------------------------------------------------------------------
# Checks for typedefs, structures, and compiler characteristics.
+#----------------------------------------------------------------------------
AC_TYPE_UID_T
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
AC_HEADER_TIME
+#----------------------------------------------------------------------------
# Checks for library functions.
+#----------------------------------------------------------------------------
AC_FUNC_MEMCMP
AC_FUNC_MMAP
AC_TYPE_SIGNAL
@@ -1440,6 +1496,10 @@
AM_CONDITIONAL([HAVE_PTHREAD_SPINLOCK],
[test x$ac_cv_func_pthread_spin_lock = xyes])
+
+#----------------------------------------------------------------------------
+# MPI checks
+#----------------------------------------------------------------------------
# Do we have a useable MPI setup on the primary and/or secondary targets?
# On Linux, by default, assumes mpicc and -m32/-m64
# On AIX, by default, assumes mpxlc and -q32/-q64
@@ -1447,29 +1507,29 @@
# understands -m32/-m64/-q32/-q64 regardless of what is specified using
# --with-mpicc=.
MPI_CC="mpicc"
-if test x$VG_PLATFORM_PRI = xPPC32_AIX5 \
- -o x$VG_PLATFORM_PRI = xPPC64_AIX5 ; then
+if test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5 ; then
MPI_CC="mpxlc"
fi
mflag_primary=
-if test x$VG_PLATFORM_PRI = xX86_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC32_LINUX ; then
+if test x$VGCONF_PLATFORM_PRI_CAPS = xX86_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_LINUX ; then
mflag_primary=$FLAG_M32
-elif test x$VG_PLATFORM_PRI = xAMD64_LINUX \
- -o x$VG_PLATFORM_PRI = xPPC64_LINUX ; then
+elif test x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_LINUX \
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_LINUX ; then
mflag_primary=$FLAG_M64
-elif test x$VG_PLATFORM_PRI = xPPC32_AIX5 ; then
+elif test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 ; then
mflag_primary=-q32
-elif test x$VG_PLATFORM_PRI = xPPC64_AIX5 ; then
+elif test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5 ; then
mflag_primary=-q64
fi
mflag_secondary=
-if test x$VG_PLATFORM_SEC = xX86_LINUX \
- -o x$VG_PLATFORM_SEC = xPPC32_LINUX ; then
+if test x$VGCONF_PLATFORM_SEC_CAPS = xX86_LINUX \
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_LINUX ; then
mflag_secondary=$FLAG_M32
-elif test x$VG_PLATFORM_SEC = xPPC32_AIX5 ; then
+elif test x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_AIX5 ; then
mflag_secondary=-q32
fi
@@ -1513,7 +1573,7 @@
AC_MSG_CHECKING([secondary target for usable MPI2-compliant C compiler and mpi.h])
saved_CC=$CC
saved_CFLAGS=$CFLAGS
-if test x$VG_PLATFORM_SEC = x ; then
+if test x$VGCONF_PLATFORM_SEC_CAPS = x ; then
CC="$MPI_CC this will surely fail"
else
CC=$MPI_CC
@@ -1538,6 +1598,9 @@
AM_CONDITIONAL(BUILD_MPIWRAP_SEC, test x$ac_have_mpi2_sec = xyes)
+#----------------------------------------------------------------------------
+# Other library checks
+#----------------------------------------------------------------------------
# There now follow some tests for QtCore, Boost, and OpenMP. These
# tests are present because Drd has some regression tests that use
# these packages. All regression test programs all compiled only
@@ -1700,7 +1763,9 @@
AM_CONDITIONAL([HAVE_OPENMP], [test x$ac_have_openmp = xyes])
-# -------------------- ok. We're done. --------------------
+#----------------------------------------------------------------------------
+# Ok. We're done checking.
+#----------------------------------------------------------------------------
AC_OUTPUT(
Makefile
@@ -1723,17 +1788,12 @@
memcheck/Makefile
memcheck/tests/Makefile
memcheck/tests/amd64/Makefile
- memcheck/tests/ppc32/Makefile
- memcheck/tests/ppc64/Makefile
memcheck/tests/x86/Makefile
memcheck/tests/linux/Makefile
memcheck/tests/x86-linux/Makefile
memcheck/docs/Makefile
cachegrind/Makefile
cachegrind/tests/Makefile
- cachegrind/tests/amd64/Makefile
- cachegrind/tests/ppc32/Makefile
- cachegrind/tests/ppc64/Makefile
cachegrind/tests/x86/Makefile
cachegrind/docs/Makefile
cachegrind/cg_annotate
@@ -1774,11 +1834,11 @@
cat<<EOF
- configure.in: VG_ARCH_MAX = ${VG_ARCH_MAX}
- configure.in: VG_ARCH_PRI = ${VG_ARCH_PRI}
+ configure.in: ARCH_MAX = ${ARCH_MAX}
+ configure.in: VGCONF_ARCH_PRI = ${VGCONF_ARCH_PRI}
- Primary build target: ${VG_PLATFORM_PRI}
- Secondary build target: ${VG_PLATFORM_SEC}
+ Primary build target: ${VGCONF_PLATFORM_PRI_CAPS}
+ Secondary build target: ${VGCONF_PLATFORM_SEC_CAPS}
Default supp files: ${DEFAULT_SUPP}
EOF
Modified: branches/DARWIN/coregrind/Makefile.am
===================================================================
--- branches/DARWIN/coregrind/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/coregrind/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -21,28 +21,28 @@
default.supp: $(SUPP_FILES)
noinst_LIBRARIES =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_LIBRARIES += libcoregrind_x86_linux.a libreplacemalloc_toolpreload_x86_linux.a
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_LIBRARIES += libcoregrind_amd64_linux.a libreplacemalloc_toolpreload_amd64_linux.a
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_LIBRARIES += libcoregrind_ppc32_linux.a libreplacemalloc_toolpreload_ppc32_linux.a
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_LIBRARIES += libcoregrind_ppc64_linux.a libreplacemalloc_toolpreload_ppc64_linux.a
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_LIBRARIES += libcoregrind_ppc32_aix5.a libreplacemalloc_toolpreload_ppc32_aix5.a
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_LIBRARIES += libcoregrind_ppc64_aix5.a libreplacemalloc_toolpreload_ppc64_aix5.a
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_LIBRARIES += libcoregrind_x86_darwin.a libreplacemalloc_toolpreload_x86_darwin.a
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_LIBRARIES += libcoregrind_amd64_darwin.a libreplacemalloc_toolpreload_amd64_darwin.a
endif
@@ -52,25 +52,25 @@
bin_PROGRAMS = \
valgrind no_op_client_for_valgrind
-if VGO_AIX5
+if VGCONF_OS_IS_LINUX
valgrind_SOURCES = \
+ launcher-linux.c \
+ m_debuglog.c
+endif
+if VGCONF_OS_IS_AIX5
+valgrind_SOURCES = \
launcher-aix5.c \
m_debuglog.c \
m_vkiscnums.c
endif
-if VGO_LINUX
+if VGCONF_OS_IS_DARWIN
valgrind_SOURCES = \
- launcher-linux.c \
- m_debuglog.c
-endif
-if VGO_DARWIN
-valgrind_SOURCES = \
launcher-darwin.c \
m_debuglog.c
endif
# Mach RPC interface definitions
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
mach_defs = \
clock.defs \
clock_priv.defs \
@@ -116,28 +116,28 @@
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += vgpreload_core-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += vgpreload_core-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += vgpreload_core-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += vgpreload_core-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += vgpreload_core-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += vgpreload_core-ppc64-aix5.so
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += vgpreload_core-x86-darwin.so
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += vgpreload_core-amd64-darwin.so
endif
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-generic.c 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1978,7 +1978,7 @@
// * needs to not use fixed-position mmap() on Darwin
// (mmap will cheerfully smash whatever's already there, which might
// be a new mapping from some other thread in a nonblocking call)
-#if defined(VGO_DARWIN)
+#if defined(VGO_darwin)
__builtin_trap();
#endif
Modified: branches/DARWIN/docs/internals/multiple-architectures.txt
===================================================================
--- branches/DARWIN/docs/internals/multiple-architectures.txt 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/docs/internals/multiple-architectures.txt 2009-01-22 22:36:02 UTC (rev 9033)
@@ -41,21 +41,25 @@
The configure script inspects the CPU. It then sets
- VG_PLATFORM_PRI to be the primary target
- VG_PLATFORM_SEC to be the secondary target, if any
+ VGCONF_PLATFORM_PRI_CAPS to be the primary target
+ VGCONF_PLATFORM_SEC_CAPS to be the secondary target, if any
It also sets one (single-arch build) or two (dual-arch build) of
the following:
- VG_X86_LINUX
- VG_AMD64_LINUX
- VG_PPC32_LINUX
- VG_PPC64_LINUX
+ VGCONF_PLATFORMS_INCLUDE_X86_LINUX
+ VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
+ VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
+ VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
+ ...
-On an amd64 system both VG_X86_LINUX and VG_AMD64_LINUX will be true
-so that two versions of all the tools will be built. Similarly on a
-ppc64 system both VG_PPC32_LINUX and VG_PPC64_LINUX will be defined.
-For the amd64 example, the coregrind libraries will be named:
+On an amd64 system both VGCONF_PLATFORMS_INCLUDE_X86_LINUX and
+VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX will be true so that two versions of
+all the tools will be built. Similarly on a ppc64 system both
+VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX and
+VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX will be defined (unless
+--enable-only32bit or --enable-only64bit is used). For the amd64 example,
+ the coregrind libraries will be named:
libcoregrind_x86_linux.a
libcoregrind_amd64_linux.a
@@ -117,13 +121,8 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In places where compilation should happen twice (on a dual-arch
system), the decision about which directories and flags to use is
-guarded by the symbols:
+guarded by the VGCONF_PLATFORMS_INCLUDE_* symbols.
- VG_X86_LINUX
- VG_AMD64_LINUX
- VG_PPC32_LINUX
- VG_PPC64_LINUX
-
But there are also places where building must only happen once,
for the primary architecture. These places are (at least):
Modified: branches/DARWIN/docs/internals/porting-HOWTO.txt
===================================================================
--- branches/DARWIN/docs/internals/porting-HOWTO.txt 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/docs/internals/porting-HOWTO.txt 2009-01-22 22:36:02 UTC (rev 9033)
@@ -17,8 +17,7 @@
thorough!) Put in Makefile.am files for them, edit them for the new
architecture name.
-- Update configure.in (use x86 and x86-linux as a guide). Don't forget to
- update VG_ARCH_ALL, VG_PLATFORM_ALL.
+- Update configure.in (use x86 and x86-linux as a guide).
Once it configures ok, get it to compile:
@@ -86,7 +85,6 @@
- Create necessary subdirs (copy linux/ and x86-linux/ subdirs).
- Update configure.in (use linux and x86-linux as a guide).
- Don't forget to update VG_OS_ALL, VG_PLATFORM_ALL.
- Implement all the necessary OS-specific and platform-specific types,
functions, and macros... use the following as templates:
Modified: branches/DARWIN/drd/Makefile.am
===================================================================
--- branches/DARWIN/drd/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/drd/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1,22 +1,22 @@
include $(top_srcdir)/Makefile.tool.am
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += drd-x86-linux vgpreload_drd-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += drd-amd64-linux vgpreload_drd-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += drd-ppc32-linux vgpreload_drd-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += drd-ppc64-linux vgpreload_drd-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += drd-ppc32-aix5 vgpreload_drd-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += drd-ppc64-aix5 vgpreload_drd-ppc64-aix5.so
endif
Modified: branches/DARWIN/drd/tests/Makefile.am
===================================================================
--- branches/DARWIN/drd/tests/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/drd/tests/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -197,8 +197,8 @@
trylock.vgtest
AM_CFLAGS = $(WERROR) -Wall @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter\
- -g $(AM_FLAG_M3264_PRI) -DVGA_$(VG_ARCH_PRI)=1 -DVGO_$(VG_OS)=1 \
- -DVGP_$(VG_ARCH_PRI)_$(VG_OS)=1
+ -g $(AM_FLAG_M3264_PRI) -DVGA_$(VGCONF_ARCH_PRI)=1 \
+ -DVGO_$(VGCONF_OS)=1 -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
-I$(top_builddir)/include -I$(top_srcdir)/VEX/pub
AM_CXXFLAGS = $(AM_CFLAGS)
Modified: branches/DARWIN/exp-omega/Makefile.am
===================================================================
--- branches/DARWIN/exp-omega/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/exp-omega/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -12,28 +12,28 @@
##zz
##zz # include memcheck/ for mac_shared.h
##zz noinst_PROGRAMS =
-##zz if VGP_X86_LINUX
+##zz if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
##zz noinst_PROGRAMS += exp-omega-x86-linux vgpreload_exp-omega-x86-linux.so
##zz endif
-##zz if VGP_AMD64_LINUX
+##zz if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
##zz noinst_PROGRAMS += exp-omega-amd64-linux vgpreload_exp-omega-amd64-linux.so
##zz endif
-##zz if VGP_PPC32_LINUX
+##zz if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
##zz noinst_PROGRAMS += exp-omega-ppc32-linux vgpreload_exp-omega-ppc32-linux.so
##zz endif
-##zz if VGP_PPC64_LINUX
+##zz if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
##zz noinst_PROGRAMS += exp-omega-ppc64-linux vgpreload_exp-omega-ppc64-linux.so
##zz endif
-##zz if VGP_PPC32_AIX5
+##zz if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
##zz noinst_PROGRAMS += exp-omega-ppc32-aix5 vgpreload_exp-omega-ppc32-aix5.so
##zz endif
-##zz if VGP_PPC64_AIX5
+##zz if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
##zz noinst_PROGRAMS += exp-omega-ppc64-aix5 vgpreload_exp-omega-ppc64-aix5.so
##zz endif
-##zz if VGP_X86_DARWIN
+##zz if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
##zz noinst_PROGRAMS += exp-omega-x86-darwin vgpreload_exp-omega-x86-darwin.so
##zz endif
-##zz if VGP_AMD64_DARWIN
+##zz if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
##zz noinst_PROGRAMS += exp-omega-amd64-darwin vgpreload_exp-omega-amd64-darwin.so
##zz endif
##zz
Modified: branches/DARWIN/exp-ptrcheck/Makefile.am
===================================================================
--- branches/DARWIN/exp-ptrcheck/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/exp-ptrcheck/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1,22 +1,22 @@
include $(top_srcdir)/Makefile.tool.am
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += exp-ptrcheck-x86-linux vgpreload_exp-ptrcheck-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += exp-ptrcheck-amd64-linux vgpreload_exp-ptrcheck-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += exp-ptrcheck-ppc32-linux vgpreload_exp-ptrcheck-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += exp-ptrcheck-ppc64-linux vgpreload_exp-ptrcheck-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += exp-ptrcheck-ppc32-aix5 vgpreload_exp-ptrcheck-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += exp-ptrcheck-ppc64-aix5 vgpreload_exp-ptrcheck-ppc64-aix5.so
endif
Modified: branches/DARWIN/exp-ptrcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/exp-ptrcheck/tests/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/exp-ptrcheck/tests/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -3,20 +3,10 @@
include $(top_srcdir)/Makefile.flags.am
#SUBDIRS = .
-#if VGP_X86_LINUX
+#if VGCONF_ARCHS_INCLUDE_X86
#SUBDIRS += x86
-#endif
-#if VGP_AMD64_LINUX
-#SUBDIRS += amd64
-#endif
-#if VGP_PPC32_LINUX
-#SUBDIRS += ppc32
-#endif
-#if VGP_PPC64_LINUX
-#SUBDIRS += ppc64
-#endif
-#DIST_SUBDIRS = ${VG_ARCH_ALL} .
+#DIST_SUBDIRS = x86 .
noinst_SCRIPTS = filter_stderr filter_add filter_suppgen \
sh_script
@@ -88,7 +78,7 @@
# DDD: not sure if these ones should work on Darwin or not... if not, should
# be moved into x86-linux/.
-if ! VGO_DARWIN
+if ! VGCONF_OS_IS_DARWIN
check_PROGRAMS += \
ccc
endif
@@ -146,15 +136,15 @@
# Build shared object for preen_invars
preen_invars_SOURCES = preen_invars.c
preen_invars_DEPENDENCIES = preen_invars_so.so
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
preen_invars_LDADD = -ldl
preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI)
else
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
preen_invars_LDADD = -ldl
preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
else
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
preen_invars_LDADD = -ldl
preen_invars_LDFLAGS = $(AM_FLAG_M3264_PRI)
else
@@ -169,14 +159,14 @@
preen_invars_so_so_LDADD =
preen_invars_so_so_DEPENDENCIES =
preen_invars_so_so_CFLAGS = -fpic $(AM_FLAG_M3264_PRI) -g
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
preen_invars_so_so_LDFLAGS = -fpic $(AM_FLAG_M3264_PRI) -shared
else
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
preen_invars_so_so_LDFLAGS = -fpic $(AM_FLAG_M3264_PRI) -shared \
-Wl,-G -Wl,-bnogc
else
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
preen_invars_so_so_LDFLAGS = -fpic $(AM_FLAG_M3264_PRI) -dynamic \
-dynamiclib -all_load
else
Modified: branches/DARWIN/helgrind/Makefile.am
===================================================================
--- branches/DARWIN/helgrind/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/helgrind/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1,28 +1,28 @@
include $(top_srcdir)/Makefile.tool.am
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += helgrind-x86-linux vgpreload_helgrind-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += helgrind-amd64-linux vgpreload_helgrind-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += helgrind-ppc32-linux vgpreload_helgrind-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += helgrind-ppc64-linux vgpreload_helgrind-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += helgrind-ppc32-aix5 vgpreload_helgrind-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += helgrind-ppc64-aix5 vgpreload_helgrind-ppc64-aix5.so
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += helgrind-x86-darwin vgpreload_helgrind-x86-darwin.so
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += helgrind-amd64-darwin vgpreload_helgrind-amd64-darwin.so
endif
Modified: branches/DARWIN/helgrind/tests/Makefile.am
===================================================================
--- branches/DARWIN/helgrind/tests/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/helgrind/tests/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -157,7 +157,7 @@
# DDD: all of these use barriers and/or spinlocks, which are optional in
# pthreads and Darwin doesn't support. Could do a configure-time test like
# the one done for Qt above.
-if ! VGO_DARWIN
+if ! VGCONF_OS_IS_DARWIN
check_PROGRAMS += \
bar_bad \
bar_trivial \
Modified: branches/DARWIN/lackey/Makefile.am
===================================================================
--- branches/DARWIN/lackey/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/lackey/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1,28 +1,28 @@
include $(top_srcdir)/Makefile.tool.am
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += lackey-x86-linux
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += lackey-amd64-linux
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += lackey-ppc32-linux
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += lackey-ppc64-linux
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += lackey-ppc32-aix5
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += lackey-ppc64-aix5
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += lackey-x86-darwin
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += lackey-amd64-darwin
endif
Modified: branches/DARWIN/massif/Makefile.am
===================================================================
--- branches/DARWIN/massif/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/massif/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -5,28 +5,28 @@
bin_SCRIPTS = ms_print
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += massif-x86-linux vgpreload_massif-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += massif-amd64-linux vgpreload_massif-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += massif-ppc32-linux vgpreload_massif-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += massif-ppc64-linux vgpreload_massif-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += massif-ppc32-aix5 vgpreload_massif-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += massif-ppc64-aix5 vgpreload_massif-ppc64-aix5.so
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += massif-x86-darwin vgpreload_massif-x86-darwin.so
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += massif-amd64-darwin vgpreload_massif-amd64-darwin.so
endif
Modified: branches/DARWIN/memcheck/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/memcheck/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -1,28 +1,28 @@
include $(top_srcdir)/Makefile.tool.am
noinst_PROGRAMS =
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
noinst_PROGRAMS += memcheck-x86-linux vgpreload_memcheck-x86-linux.so
endif
-if VGP_AMD64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX
noinst_PROGRAMS += memcheck-amd64-linux vgpreload_memcheck-amd64-linux.so
endif
-if VGP_PPC32_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX
noinst_PROGRAMS += memcheck-ppc32-linux vgpreload_memcheck-ppc32-linux.so
endif
-if VGP_PPC64_LINUX
+if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX
noinst_PROGRAMS += memcheck-ppc64-linux vgpreload_memcheck-ppc64-linux.so
endif
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
noinst_PROGRAMS += memcheck-ppc32-aix5 vgpreload_memcheck-ppc32-aix5.so
endif
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
noinst_PROGRAMS += memcheck-ppc64-aix5 vgpreload_memcheck-ppc64-aix5.so
endif
-if VGP_X86_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
noinst_PROGRAMS += memcheck-x86-darwin vgpreload_memcheck-x86-darwin.so
endif
-if VGP_AMD64_DARWIN
+if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN
noinst_PROGRAMS += memcheck-amd64-darwin vgpreload_memcheck-amd64-darwin.so
endif
Modified: branches/DARWIN/memcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/Makefile.am 2009-01-22 22:14:54 UTC (rev 9032)
+++ branches/DARWIN/memcheck/tests/Makefile.am 2009-01-22 22:36:02 UTC (rev 9033)
@@ -5,30 +5,24 @@
SUBDIRS = .
# Arch-specific tests.
-if VGA_X86
+if VGCONF_ARCHS_INCLUDE_X86
SUBDIRS += x86
endif
-if VGA_AMD64
+if VGCONF_ARCHS_INCLUDE_AMD64
SUBDIRS += amd64
endif
-if VGA_PPC32
-SUBDIRS += ppc32
-endif
-if VGA_PPC64
-SUBDIRS += ppc64
-endif
# OS-specific tests
-if VGO_LINUX
+if VGCONF_OS_IS_LINUX
SUBDIRS += linux
endif
# Platform-specific tests
-if VGP_X86_LINUX
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
SUBDIRS += x86-linux
endif
-DIST_SUBDIRS = ${VG_ARCH_ALL} .
+DIST_SUBDIRS = x86 amd64 linux x86-linux .
noinst_SCRIPTS = filter_allocs filter_leak_check_size \
filter_stderr filter_stderr_backtrace filter_xml \
@@ -242,8 +236,9 @@
# Extra stuff for C tests
memcmptest_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -fno-builtin-memcmp
oset_test_CFLAGS = $(AM_FLAG_M3264_PRI) \
- -DVGA_$(VG_ARCH_PRI)=1 -DVGO_$(VG_OS)=1 \
- -DVGP_$(VG_ARCH_PRI)_$(VG_OS)=1
+ -DVGA_$(VGCONF_ARCH_PRI)=1 \
+ -DVGO_$(VGCONF_OS)=1 \
+ -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
vcpu_bz2_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
vcpu_fbench_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
vcpu_fnfns_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
@@ -279,8 +274,8 @@
long_namespace_xml_SOURCES = long_namespace_xml.cpp
deep_templates_CXXFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -gstabs
-if VGP_PPC32_AIX5
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
else
# persuade the AIX linker not to junk apparently unused
# function descriptors. Unfortunately -Wl,-G -Wl,-bnogc
@@ -299,15 +294,15 @@
# Build shared object for wrap7
wrap7_SOURCES = wrap7.c
wrap7_DEPENDENCIES = wrap7so.so
-if VGP_PPC64_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
wrap7_LDADD = `pwd`/wrap7so.so
wrap7_LDFLAGS = $(AM_FLAG_M3264_PRI)
else
-if VGP_PPC32_AIX5
+if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
wrap7_LDADD = `pwd`/wrap7so.so
wrap7_LDFLAGS = $(AM_FLAG_M3264_PRI) -Wl,-G -Wl,-bnogc
else
-if VGO_DARWIN
+if VGCONF_OS_IS_DARWIN
wrap7_LDADD = `pwd`/wrap7so.so
wrap7_LDFLAGS = $(AM_FLAG_M3264_PRI)
else
@@ -322,14 +317,14 @@
wrap7so_so_LDAD...
[truncated message content] |