From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 17 Apr 2009 07:14:29 +0000 (+0000)
Subject: Merge r9571 (get faultstatus building again) from the DARWIN branch.
X-Git-Tag: svn/VALGRIND_3_5_0~806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ee960caa26f06a44ee9e6acd4c051f3493da482;p=thirdparty%2Fvalgrind.git

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 ebdcd57fc3..6335c19c89 100644
--- 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()