From: Julian Seward <jseward@acm.org>
Date: Tue, 6 May 2008 23:01:05 +0000 (+0000)
Subject: Build fixes for AIX5.3.
X-Git-Tag: svn/VALGRIND_3_4_0~624
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15dfc7886df2afd6c0067dfd29017389f3ec16a4;p=thirdparty%2Fvalgrind.git

Build fixes for AIX5.3.


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

diff --git a/exp-drd/tests/drd_bitmap_test.c b/exp-drd/tests/drd_bitmap_test.c
index 57fc2cd141..3993afad36 100644
--- a/exp-drd/tests/drd_bitmap_test.c
+++ b/exp-drd/tests/drd_bitmap_test.c
@@ -15,8 +15,14 @@ void* VG_(malloc)(SizeT nbytes)
 void  VG_(free)(void* p)
 { return free(p); }
 void  VG_(assert_fail)(Bool isCore, const Char* expr, const Char* file,
-                       Int line, const Char* fn, const HChar* format, ...)
-{ __assert_fail(expr, file, line, fn); abort(); }
+                       Int line, const Char* fn, const HChar* format, ...) {
+#if defined(__linux__)
+__assert_fail(expr, file, line, fn); abort(); 
+#else
+assert(0);
+#endif /* __linux__ */
+}
+
 void* VG_(memset)(void *s, Int c, SizeT sz)
 { return memset(s, c, sz); }
 void* VG_(memcpy)(void *d, const void *s, SizeT sz)
@@ -46,7 +52,7 @@ struct { Addr address; SizeT size; BmAccessTypeT access_type; }
     {               0x0001ffffULL, 1, eLoad  },
     {               0x00ffffffULL, 1, eLoad  },
     { 0xfffffffeULL - ADDR0_COUNT, 1, eStore },
-#if defined(VGP_amd64_linux) || defined(VGP_ppc64_linux)
+#if defined(VGP_amd64_linux) || defined(VGP_ppc64_linux) || defined(VGP_ppc64_aix5)
     { 0xffffffffULL - ADDR0_COUNT, 1, eStore },
     {               0xffffffffULL, 1, eStore },
     {              0x100000000ULL, 1, eStore },
diff --git a/memcheck/tests/linux-timerfd-syscall.c b/memcheck/tests/linux-timerfd-syscall.c
index dd321364f3..b9694ec487 100644
--- a/memcheck/tests/linux-timerfd-syscall.c
+++ b/memcheck/tests/linux-timerfd-syscall.c
@@ -298,3 +298,12 @@ int main(int ac, char **av)
 }
 
 #endif /* __linux__ */
+
+#if defined(_AIX)
+#include <stdio.h>
+int main(int ac, char **av)
+{
+   fprintf(stderr, "This test does not work on AIX5.\n");
+   return 0;
+}
+#endif /* _AIX */