diff options
| -rw-r--r-- | libc/ChangeLog.eglibc | 6 | ||||
| -rw-r--r-- | libc/debug/Makefile | 5 | ||||
| -rw-r--r-- | libc/debug/tst-backtrace2.c | 110 | ||||
| -rw-r--r-- | ports/ChangeLog.eglibc | 4 | ||||
| -rw-r--r-- | ports/sysdeps/arm/eabi/Makefile | 1 |
5 files changed, 125 insertions, 1 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index fbceccfc2..1ced59687 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,9 @@ +2009-06-24 Mark Mitchell <mark@codesourcery.com> + + * debug/Makefile (LDFLAGS-tst-backtrace2): Define. + (tests-$(OPTION_EGLIBC_BACKTRACE)): Add tst-backtrace2. + * debug/tst-backtrace2.c: New test. + 2009-06-23 Joseph Myers <joseph@codesourcery.com> * nptl/nptl-init.c (sighandler_setxid): Remove duplicate decrement diff --git a/libc/debug/Makefile b/libc/debug/Makefile index 4725eb25a..8da46a550 100644 --- a/libc/debug/Makefile +++ b/libc/debug/Makefile @@ -126,10 +126,13 @@ LDFLAGS-tst-lfschk4 = -lstdc++ LDFLAGS-tst-lfschk5 = -lstdc++ LDFLAGS-tst-lfschk6 = -lstdc++ +# backtrace_symbols only works if we link with -rdynamic. +LDFLAGS-tst-backtrace2 = -rdynamic + tests = tst-longjmp_chk test-strcpy_chk test-stpcpy_chk tests-$(OPTION_EGLIBC_LOCALE_CODE) \ += tst-chk1 tst-chk2 tst-chk3 tst-lfschk1 tst-lfschk2 tst-lfschk3 -tests-$(OPTION_EGLIBC_BACKTRACE) += backtrace-tst +tests-$(OPTION_EGLIBC_BACKTRACE) += backtrace-tst tst-backtrace2 ifeq (yy,$(OPTION_EGLIBC_LOCALE_CODE)$(OPTION_EGLIBC_CXX_TESTS)) tests += tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6 endif diff --git a/libc/debug/tst-backtrace2.c b/libc/debug/tst-backtrace2.c new file mode 100644 index 000000000..edbed2abd --- /dev/null +++ b/libc/debug/tst-backtrace2.c @@ -0,0 +1,110 @@ +/* Copyright (C) 2009 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by CodeSourcery. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <execinfo.h> +#include <search.h> +#include <string.h> + +static int do_test (void); +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" + +/* Set to a non-zero value if the test fails. */ +int ret; + +/* Accesses to X are used to prevent optimization. */ +volatile int x; + +/* Called if the test fails. */ +#define FAIL() \ + do { printf ("Failure on line %d\n", __LINE__); ret = 1; } while (0) + +/* The backtrace should include at least f1, f2, f3, and do_test. */ +#define NUM_FUNCTIONS 4 + +/* Use this attribute to prevent inlining, so that all expected frames + are present. */ +#define NO_INLINE __attribute__((noinline)) + +NO_INLINE void +fn1 (void) +{ + void *addresses[NUM_FUNCTIONS]; + char **symbols; + int n; + int i; + + /* Get the backtrace addresses. */ + n = backtrace (addresses, sizeof (addresses) / sizeof (addresses[0])); + printf ("Obtained backtrace with %d functions\n", n); + /* Check that there are at least four functions. */ + if (n < NUM_FUNCTIONS) + { + FAIL (); + return; + } + /* Convert them to symbols. */ + symbols = backtrace_symbols (addresses, n); + /* Check that symbols were obtained. */ + if (symbols == NULL) + { + FAIL (); + return; + } + for (i = 0; i < n; ++i) + printf ("Function %d: %s\n", i, symbols[i]); + /* Check that the function names obtained are accurate. */ + if (strstr (symbols[0], "fn1") == NULL) + { + FAIL (); + return; + } + /* Symbol names are not available for static functions, so we do not + check f2. */ + if (strstr (symbols[2], "fn3") == NULL) + { + FAIL (); + return; + } + /* Symbol names are not available for static functions, so we do not + check do_test. */ +} + +NO_INLINE static int +fn2 (void) +{ + fn1 (); + /* Prevent tail calls. */ + return x; +} + +NO_INLINE int +fn3 (void) +{ + fn2(); + /* Prevent tail calls. */ + return x; +} + +NO_INLINE static int +do_test (void) +{ + fn3 (); + return ret; +} diff --git a/ports/ChangeLog.eglibc b/ports/ChangeLog.eglibc index 606189919..45bc95671 100644 --- a/ports/ChangeLog.eglibc +++ b/ports/ChangeLog.eglibc @@ -1,3 +1,7 @@ +2009-06-24 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/arm/eabi/Makefile (CFLAGS-tst-backtrace2.c): Define. + 2009-05-22 Joseph Myers <joseph@codesourcery.com> * sysdeps/powerpc/powerpc32/e500/fpu/__longjmp-common.S: Use diff --git a/ports/sysdeps/arm/eabi/Makefile b/ports/sysdeps/arm/eabi/Makefile index 4b7173bf3..22d62edef 100644 --- a/ports/sysdeps/arm/eabi/Makefile +++ b/ports/sysdeps/arm/eabi/Makefile @@ -16,6 +16,7 @@ endif ifeq ($(subdir),debug) CFLAGS-backtrace.c += -funwind-tables +CFLAGS-tst-backtrace2.c += -funwind-tables endif ifeq ($(subdir),elf) |