From: Julian Seward <jseward@acm.org>
Date: Mon, 25 Apr 2005 16:21:17 +0000 (+0000)
Subject: amd64 build fixes.
X-Git-Tag: svn/VALGRIND_3_0_0~751
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c862370c01f419ae047c3d99f32b6a698e5266bb;p=thirdparty%2Fvalgrind.git

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 66a1bd1963..03d8dbf3d5 100644
--- 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 0f4dd420b5..9a81c56f67 100644
--- 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 e6fc53b4f6..241615d452 100644
--- 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"