The load addresses depend on the platform, not the architecture.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8992 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/configure.in b/configure.in
index d10bd2c..1c6eff8 100644
--- a/configure.in
+++ b/configure.in
@@ -146,29 +146,21 @@
AC_SUBST(VG_ARCH_ALL)
VG_ARCH_ALL="amd64 ppc32 ppc64 x86"
-AC_SUBST(VALT_LOAD_ADDRESS)
-
case "${host_cpu}" in
i?86)
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH_MAX="x86"
- valt_load_address_normal="0x38000000"
- valt_load_address_inner="0x28000000"
;;
x86_64)
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH_MAX="amd64"
- valt_load_address_normal="0x38000000"
- valt_load_address_inner="0x28000000"
;;
powerpc64)
# This value can only happen on Linux, not on AIX
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH_MAX="ppc64"
- valt_load_address_normal="0x38000000"
- valt_load_address_inner="0x28000000"
;;
powerpc)
@@ -183,8 +175,6 @@
VG_ARCH_MAX="ppc32"
;;
esac
- valt_load_address_normal="0x38000000"
- valt_load_address_inner="0x28000000"
;;
*)
@@ -193,20 +183,6 @@
;;
esac
-# Check if this should be built as an inner Valgrind, to be run within
-# another Valgrind. Choose the load address accordingly.
-AC_CACHE_CHECK([for use as an inner Valgrind], vg_cv_inner,
- [AC_ARG_ENABLE(inner,
- [ --enable-inner enables self-hosting],
- [vg_cv_inner=$enableval],
- [vg_cv_inner=no])])
-if test "$vg_cv_inner" = yes; then
- AC_DEFINE([ENABLE_INNER], 1, [configured to run as an inner Valgrind])
- VALT_LOAD_ADDRESS=$valt_load_address_inner
-else
- VALT_LOAD_ADDRESS=$valt_load_address_normal
-fi
-
# 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
@@ -344,6 +320,8 @@
x86-linux)
VG_PLATFORM_PRI="X86_LINUX"
VG_PLATFORM_SEC=""
+ valt_load_address_normal="0x38000000"
+ valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
amd64-linux)
@@ -358,11 +336,15 @@
VG_PLATFORM_PRI="AMD64_LINUX"
VG_PLATFORM_SEC="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=""
+ valt_load_address_normal="0x38000000"
+ valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
ppc64-aix5)
@@ -377,6 +359,8 @@
VG_PLATFORM_PRI="PPC64_AIX5"
VG_PLATFORM_SEC="PPC32_AIX5"
fi
+ valt_load_address_normal="0x38000000"
+ valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
ppc64-linux)
@@ -391,6 +375,8 @@
VG_PLATFORM_PRI="PPC64_LINUX"
VG_PLATFORM_SEC="PPC32_LINUX"
fi
+ valt_load_address_normal="0x38000000"
+ valt_load_address_inner="0x28000000"
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;
*)
@@ -456,6 +442,22 @@
test x$VG_PLATFORM_SEC != x)
+# 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)
+AC_CACHE_CHECK([for use as an inner Valgrind], vg_cv_inner,
+ [AC_ARG_ENABLE(inner,
+ [ --enable-inner enables self-hosting],
+ [vg_cv_inner=$enableval],
+ [vg_cv_inner=no])])
+if test "$vg_cv_inner" = yes; then
+ AC_DEFINE([ENABLE_INNER], 1, [configured to run as an inner Valgrind])
+ VALT_LOAD_ADDRESS=$valt_load_address_inner
+else
+ VALT_LOAD_ADDRESS=$valt_load_address_normal
+fi
+
+
# This variable will collect the individual suppression files
# depending on the results of autoconf
DEFAULT_SUPP=""