Update for x86. 
r8744 gave mainSort the "noinline" attribute, thereby changing
the backtrace. Nox fixed.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12080 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86
index 8b7e1f9..1044e4a 100644
--- a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86
+++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86
@@ -28,7 +28,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+   at 0x........: mainSort (origin5-bz2.c:2820)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -38,7 +39,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+   at 0x........: mainSort (origin5-bz2.c:2823)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -48,7 +50,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2855)
+   at 0x........: mainSort (origin5-bz2.c:2854)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -58,7 +61,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2859)
+   at 0x........: mainSort (origin5-bz2.c:2858)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -68,7 +72,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+   at 0x........: mainSort (origin5-bz2.c:2963)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -78,7 +83,8 @@
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 4
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2964)
+   at 0x........: mainSort (origin5-bz2.c:2964)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)