|
From: <sv...@va...> - 2009-04-17 07:07:29
|
Author: njn
Date: 2009-04-17 08:07:24 +0100 (Fri, 17 Apr 2009)
New Revision: 9571
Log:
Make faultstatus compile (it still doesn't pass on Darwin, though).
Modified:
branches/DARWIN/none/tests/x86/Makefile.am
branches/DARWIN/none/tests/x86/faultstatus.c
Modified: branches/DARWIN/none/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/none/tests/x86/Makefile.am 2009-04-17 07:01:24 UTC (rev 9570)
+++ branches/DARWIN/none/tests/x86/Makefile.am 2009-04-17 07:07:24 UTC (rev 9571)
@@ -66,6 +66,7 @@
bug152818-x86 \
cmpxchg8b \
cse_fail \
+ faultstatus \
fcmovnu \
fpu_lazy_eflags \
fxtract \
@@ -89,8 +90,7 @@
# be moved into x86-linux/.
if ! VGCONF_OS_IS_DARWIN
check_PROGRAMS += \
- cpuid \
- faultstatus
+ cpuid
endif
AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
Modified: branches/DARWIN/none/tests/x86/faultstatus.c
===================================================================
--- branches/DARWIN/none/tests/x86/faultstatus.c 2009-04-17 07:01:24 UTC (rev 9570)
+++ branches/DARWIN/none/tests/x86/faultstatus.c 2009-04-17 07:07:24 UTC (rev 9571)
@@ -6,8 +6,9 @@
#include <stdlib.h>
#include <fcntl.h>
#include <setjmp.h>
+#include <unistd.h>
+#include "tests/asm.h"
#include "tests/sys_mman.h"
-#include <unistd.h>
struct test {
void (*test)(void);
@@ -76,7 +77,7 @@
extern char test1_ill;
static void test1()
{
- asm volatile("test1_ill: ud2");
+ asm volatile(VG_SYM(test1_ill) ": ud2");
}
static void test2()
|