Merge r9666 (badseg portability tweak) from the DARWIN branch.

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

diff --git a/none/tests/x86/badseg.c b/none/tests/x86/badseg.c
index 50335e9933a847e24f0ca006ea2b1e6c2d3d2f5a..2cc1450dda1223b753c01118339e1cb51772786e 100644 (file)
--- a/none/tests/x86/badseg.c
+++ b/none/tests/x86/badseg.c
@@ -4,8 +4,8 @@
 
 static void handler(int sig, siginfo_t *info, void *v)
 {
-       printf("info: sig=%d code=%d addr=%p\n",
-              info->si_signo, info->si_code, info->si_addr);
+       printf("info: sig=%d code=%d addr=0x%lx\n",
+              info->si_signo, info->si_code, (unsigned long)info->si_addr);
        exit(0);
 }
 

diff --git a/none/tests/x86/badseg.stdout.exp b/none/tests/x86/badseg.stdout.exp
index 40a293750fd0e02ae2f44384e1372e7353b4624b..c8a7a90c53cead2329e2cfffdfcc9220b5ba8860 100644 (file)
--- a/none/tests/x86/badseg.stdout.exp
+++ b/none/tests/x86/badseg.stdout.exp
@@ -1 +1 @@
-info: sig=11 code=128 addr=(nil)
+info: sig=11 code=128 addr=0x0