Several unrelated changes:
- don't use AS_STRING_HELP, as older autoconfs don't like it
- fix a minor stupidity about the GDB path
- allow amd64 as a platform (wee!)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3085 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/configure.in b/configure.in
index 568fa57..222e03f 100644
--- a/configure.in
+++ b/configure.in
@@ -7,8 +7,13 @@
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:
+#
+# AS_HELP_STRING([--with-vex], [Vex directory (must be specified!)]),
+#
AC_ARG_WITH(vex,
- AS_HELP_STRING([--with-vex], [Vex directory (must be specified!)]),
+ [ --with-vex=<DIR> Vex directory (must be specified!)],
[
AC_CHECK_FILE($withval/pub/libvex.h,
[VEX_DIR=$withval],
@@ -39,9 +44,7 @@
# figure out where gdb lives
AC_PATH_PROG(GDB, gdb)
-# autoheader tries to execute the 3rd string or something; I get warnings when
-# it's defined. So just leave it undefined. --njn 2002-Apr-18
-AC_DEFINE_UNQUOTED(GDB_PATH, "$GDB", "")
+AC_DEFINE_UNQUOTED(GDB_PATH, "$GDB", [path to GDB])
# some older automake's don't have it so try something on our own
ifdef([AM_PROG_AS],[AM_PROG_AS],
@@ -96,6 +99,18 @@
ARCH_CORE_AM_CCASFLAGS=""
;;
+ x86_64)
+ AC_MSG_RESULT([ok (${host_cpu})])
+ VG_ARCH="amd64"
+ # OOO: relocations under x86-64 small model are 32-bit signed
+ # quantities; therefore going above 0x7fffffff doesn't work... this is
+ # a problem.
+ KICKSTART_BASE="0x70000000"
+ ARCH_CORE_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -DELFSZ=64"
+ ARCH_TOOL_AM_CFLAGS="-fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@"
+ ARCH_CORE_AM_CCASFLAGS=""
+ ;;
+
arm*)
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH="arm"
@@ -170,11 +185,7 @@
VG_PLATFORM="$VG_ARCH-$VG_OS"
case $VG_PLATFORM in
- x86-linux)
- AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
- ;;
-
- arm-linux)
+ x86-linux|amd64-linux|arm-linux)
AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
;;