diff options
| author | Mark Wielaard <mjw@redhat.com> | 2014-05-18 22:41:19 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2014-05-18 22:45:45 +0200 |
| commit | 85482fc073442a056e0e3663eb454fa76d883271 (patch) | |
| tree | 5e662e12f147410e8b46cd83dd415f022f8381fb | |
| parent | f05dff9d390f0692f5c74f9551ce6b2eeda78ed4 (diff) | |
| download | elfutils-85482fc073442a056e0e3663eb454fa76d883271.tar.gz | |
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>
| -rw-r--r-- | tests/ChangeLog | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/testfile-backtrace-demangle.bz2 | bin | 2610 -> 3016 bytes | |||
| -rw-r--r-- | tests/testfile-backtrace-demangle.cc | 4 | ||||
| -rw-r--r-- | tests/testfile-backtrace-demangle.core.bz2 | bin | 40629 -> 39510 bytes |
4 files changed, 9 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 380facd8..bb0ad0d4 100644 --- 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 Binary files differindex c3156e89..f0294df1 100644..100755 --- a/tests/testfile-backtrace-demangle.bz2 +++ b/tests/testfile-backtrace-demangle.bz2 diff --git a/tests/testfile-backtrace-demangle.cc b/tests/testfile-backtrace-demangle.cc index 6daa4297..27fff685 100644 --- 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 Binary files differindex c68edce1..263c3049 100644 --- a/tests/testfile-backtrace-demangle.core.bz2 +++ b/tests/testfile-backtrace-demangle.core.bz2 |