Merge r9571 (get faultstatus building again) from the DARWIN branch.

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

diff --git a/none/tests/x86/faultstatus.c b/none/tests/x86/faultstatus.c
index ebdcd57fc310f6b944d1f260d2a88c720fd321b4..6335c19c897fa66310a9e5d7ebc08d393b814f93 100644 (file)
--- a/none/tests/x86/faultstatus.c
+++ b/none/tests/x86/faultstatus.c
@@ -6,8 +6,9 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <setjmp.h>
-#include "tests/sys_mman.h"
 #include <unistd.h>
+#include "tests/asm.h"
+#include "tests/sys_mman.h"
 
 struct test {
        void (*test)(void);
@@ -76,7 +77,7 @@ static void handler(int sig, siginfo_t *si, void *uc)
 extern char test1_ill;
 static void test1()
 {
-       asm volatile("test1_ill: ud2");
+       asm volatile(VG_SYM(test1_ill) ": ud2");
 }
 
 static void test2()