tests: Don't use static functions in testfile-backtrace-demangle.

Compilers and demanglers might treat local/static functions different
between versions. In particular g++ 4.1.2 and libstdc++ mangle and
demangle the static void cxxfunc (int i) function as _Z7cxxfunci.
While g++ 4.8.2 and libstdc++ mangle and demangle it as _ZL7cxxfunci.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 380facd891a8bf907d3e93b0c8de9343ec03a690..bb0ad0d4b34a88cd774301922295413125ae9887 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-18  Mark Wielaard  <mjw@redhat.com>
+
+       * testfile-backtrace-demangle.cc (cxxfunc): Make non-static.
+       (f): Likewise.
+       * testfile-backtrace-demangle.bz2: Regenerate.
+       * testfile-backtrace-demangle.core.bz2: Likewise.
+
 2014-05-02  Mark Wielaard  <mjw@redhat.com>
 
        * Makefile.am (TESTS): run-readelf-dwz-multi.sh and

diff --git a/tests/testfile-backtrace-demangle.bz2 b/tests/testfile-backtrace-demangle.bz2
old mode 100644 (file)
new mode 100755 (executable)
index c3156e8..f0294df
Binary files a/tests/testfile-backtrace-demangle.bz2 and b/tests/testfile-backtrace-demangle.bz2 differ

diff --git a/tests/testfile-backtrace-demangle.cc b/tests/testfile-backtrace-demangle.cc
index 6daa4297a650fabddcf102e1a2a037b1fd6d5746..27fff685b9f18cfad93dd36d1ce775caf3b1fee3 100644 (file)
--- a/tests/testfile-backtrace-demangle.cc
+++ b/tests/testfile-backtrace-demangle.cc
@@ -21,7 +21,7 @@
 #define NOINLINE_NOCLONE __attribute__ ((noinline))
 #endif
 
-static void NOINLINE_NOCLONE
+void NOINLINE_NOCLONE
 cxxfunc (int i)
 {
   *(volatile int *)0=0;
@@ -31,7 +31,7 @@ cxxfunc (int i)
 
 extern "C"
 {
-  static void NOINLINE_NOCLONE
+  void NOINLINE_NOCLONE
   f (void)
   {
     cxxfunc(1);

diff --git a/tests/testfile-backtrace-demangle.core.bz2 b/tests/testfile-backtrace-demangle.core.bz2
index c68edce1fd41339a3968a960696c85a15fa4925e..263c3049f782468ef2570e83a198aa7212f2edca 100644 (file)
Binary files a/tests/testfile-backtrace-demangle.core.bz2 and b/tests/testfile-backtrace-demangle.core.bz2 differ