|
From: <sv...@va...> - 2008-05-06 23:08:40
|
Author: sewardj
Date: 2008-05-07 00:01:05 +0100 (Wed, 07 May 2008)
New Revision: 8013
Log:
Build fixes for AIX5.3.
Modified:
trunk/exp-drd/tests/drd_bitmap_test.c
trunk/memcheck/tests/linux-timerfd-syscall.c
Modified: trunk/exp-drd/tests/drd_bitmap_test.c
===================================================================
--- trunk/exp-drd/tests/drd_bitmap_test.c 2008-05-06 21:01:19 UTC (rev 8012)
+++ trunk/exp-drd/tests/drd_bitmap_test.c 2008-05-06 23:01:05 UTC (rev 8013)
@@ -15,8 +15,14 @@
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 @@
{ 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 },
Modified: trunk/memcheck/tests/linux-timerfd-syscall.c
===================================================================
--- trunk/memcheck/tests/linux-timerfd-syscall.c 2008-05-06 21:01:19 UTC (rev 8012)
+++ trunk/memcheck/tests/linux-timerfd-syscall.c 2008-05-06 23:01:05 UTC (rev 8013)
@@ -298,3 +298,12 @@
}
#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 */
|