Dual architecture support - this commit is a major rework of the build
system that allows multiple copies of valgrind to be built so that we
can build both x86 and amd64 versions of the tools on amd64 machines.
The launcher is then modified to look at the program being run and
decide which tool to use to run it.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5027 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/configure.in b/configure.in
index 9e802bf..d275191 100644
--- a/configure.in
+++ b/configure.in
@@ -112,9 +112,6 @@
AC_SUBST(VG_ARCH_ALL)
VG_ARCH_ALL="amd64 ppc32 x86"
AC_SUBST(VALT_LOAD_ADDRESS)
-AC_SUBST(ARCH_CORE_AM_CFLAGS)
-AC_SUBST(ARCH_TOOL_AM_CFLAGS)
-AC_SUBST(ARCH_CORE_AM_CCASFLAGS)
case "${host_cpu}" in
i?86)
@@ -122,9 +119,6 @@
VG_ARCH="x86"
valt_load_address_normal="0xb0000000"
valt_load_address_inner="0xa0000000"
- ARCH_CORE_AM_CFLAGS="@FLAG_M32@ @PREFERRED_STACK_BOUNDARY@"
- ARCH_TOOL_AM_CFLAGS="@FLAG_M32@ @PREFERRED_STACK_BOUNDARY@"
- ARCH_CORE_AM_CCASFLAGS="@FLAG_M32@"
;;
x86_64)
@@ -135,15 +129,6 @@
# a problem.
valt_load_address_normal="0x70000000"
valt_load_address_inner="0x60000000"
- ARCH_CORE_AM_CFLAGS="-m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@"
- # XXX: need to use -fpic, otherwise when linking tools I get this error
- # message:
- # relocation R_X86_64_32 can not be used when making a shared object;
- # recompile with -fPIC
- #
- # I don't understand... --njn
- ARCH_TOOL_AM_CFLAGS="-m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -fpic"
- ARCH_CORE_AM_CCASFLAGS="-m64"
;;
powerpc*)
@@ -151,9 +136,6 @@
VG_ARCH="ppc32"
valt_load_address_normal="0x70000000"
valt_load_address_inner="0x60000000"
- ARCH_CORE_AM_CFLAGS=""
- ARCH_TOOL_AM_CFLAGS="-fpic"
- ARCH_CORE_AM_CCASFLAGS="-Wa,-maltivec"
;;
*)
@@ -238,6 +220,10 @@
;;
esac
+AM_CONDITIONAL(VG_X86_LINUX, test x$VG_PLATFORM = xx86-linux -o x$VG_PLATFORM = xamd64-linux)
+AM_CONDITIONAL(VG_AMD64_LINUX, test x$VG_PLATFORM = xamd64-linux)
+AM_CONDITIONAL(VG_PPC32_LINUX, test x$VG_PLATFORM = xppc32-linux)
+
AC_SUBST(DEFAULT_SUPP)
glibc=""