|
From: <sv...@va...> - 2009-04-24 04:28:18
|
Author: njn
Date: 2009-04-24 05:28:15 +0100 (Fri, 24 Apr 2009)
New Revision: 9599
Log:
Removed some Darwin-specific code that crept in from the DARWIN branch.
Modified:
trunk/tests/asm.h
trunk/tests/malloc.h
trunk/tests/sys_mman.h
Modified: trunk/tests/asm.h
===================================================================
--- trunk/tests/asm.h 2009-04-24 04:12:28 UTC (rev 9598)
+++ trunk/tests/asm.h 2009-04-24 04:28:15 UTC (rev 9599)
@@ -5,15 +5,7 @@
// general, any symbol named in asm code should be wrapped by VG_SYM.
// This one is for use in inline asm in C files.
-#if defined(VGO_darwin)
-#define VG_SYM(x) "_"#x
-#else
#define VG_SYM(x) #x
-#endif
// This one is for use in asm files.
-#if defined(VGO_darwin)
#define VG_SYM_ASM(x) _#x
-#else
-#define VG_SYM_ASM(x) x
-#endif
Modified: trunk/tests/malloc.h
===================================================================
--- trunk/tests/malloc.h 2009-04-24 04:12:28 UTC (rev 9598)
+++ trunk/tests/malloc.h 2009-04-24 04:28:15 UTC (rev 9599)
@@ -1,11 +1,7 @@
// Replacement for malloc.h which factors out platform differences.
#include <stdlib.h>
-#if defined(VGO_darwin)
-# include <malloc/malloc.h>
-#else
-# include <malloc.h>
-#endif
+#include <malloc.h>
#include <assert.h>
@@ -14,12 +10,7 @@
static void* memalign16(size_t szB)
{
void* x;
-#if defined(VGO_darwin)
- // Darwin lacks memalign, but its malloc is always 16-aligned anyway.
- x = malloc(szB);
-#else
x = memalign(16, szB);
-#endif
assert(x);
assert(0 == ((16-1) & (unsigned long)x));
return x;
Modified: trunk/tests/sys_mman.h
===================================================================
--- trunk/tests/sys_mman.h 2009-04-24 04:12:28 UTC (rev 9598)
+++ trunk/tests/sys_mman.h 2009-04-24 04:28:15 UTC (rev 9599)
@@ -2,11 +2,7 @@
#include <sys/mman.h>
-#if defined(VGO_darwin)
-# define MAP_ANONYMOUS MAP_ANON
-#endif
-
#include <assert.h>
#include <unistd.h>
|