amd64 build fixes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3567

diff --git a/coregrind/amd64-linux/syscalls.c b/coregrind/amd64-linux/syscalls.c
index 66a1bd1963afb25b72ff24ced2d169fae6c71dad..03d8dbf3d5f0f16b9ad3efab0ca9e4560ecd8efc 100644 (file)
--- a/coregrind/amd64-linux/syscalls.c
+++ b/coregrind/amd64-linux/syscalls.c
@@ -31,6 +31,7 @@
 #include "core.h"
 #include "ume.h"                /* for jmp_with_stack */
 #include "pub_core_sigframe.h"
+#include "pub_core_aspacemgr.h"
 
 
 /* COPIED FROM /usr/include/asm-i386/prctl.h (amd64-linux) */

diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c
index 0f4dd420b56ed39afb01051328a0e60c97ad352f..9a81c56f6755d3c88da572baec8a35b27f53b7d0 100644 (file)
--- a/coregrind/m_debuglog.c
+++ b/coregrind/m_debuglog.c
@@ -55,7 +55,9 @@
 
 /* ----- x86-linux specifics ----- */
 
-#if VG_PLATFORM == x86-linux
+/* Arse!  Really I want to test VG_PLATFORM, but this does not
+   seem to be possible. */
+#if defined(__i386__) && defined(__linux__)
 
 static UInt local_sys_write_stderr ( HChar* buf, Int n )
 {
@@ -80,6 +82,17 @@ static UInt local_sys_getpid ( void )
    return __res;
 }
 
+#elif defined(__x86_64__) && defined(__linux__)
+
+static UInt local_sys_write_stderr ( HChar* buf, Int n )
+{
+  return 0;
+}
+
+static UInt local_sys_getpid ( void )
+{
+  return 0;
+}
 
 #else
 #error Unknown VG_PLATFORM

diff --git a/coregrind/m_sigframe/sigframe-amd64-linux.c b/coregrind/m_sigframe/sigframe-amd64-linux.c
index e6fc53b4f6ad1dbddd30f1ea347f251001f65777..241615d452a1fa3a0da3671fb3997f2b47c14a3f 100644 (file)
--- a/coregrind/m_sigframe/sigframe-amd64-linux.c
+++ b/coregrind/m_sigframe/sigframe-amd64-linux.c
@@ -31,6 +31,7 @@
 
 #include "core.h"
 #include "pub_core_sigframe.h"
+#include "pub_core_aspacemgr.h"
 
 #include "libvex_guest_amd64.h"