about summary refs log tree commit diff
path: root/sysdeps/generic/backtrace.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-07-15 03:58:49 +0000
committerUlrich Drepper <drepper@redhat.com>2002-07-15 03:58:49 +0000
commitc3da4f0cba685e6918d2babb286bd731ae7eab71 (patch)
tree0ca3210183ced69ee55d95a2b37439fe8a64d544 /sysdeps/generic/backtrace.c
parent2acfe5d64c4a913b1462ede7c02f54949f0c7d38 (diff)
downloadglibc-c3da4f0cba685e6918d2babb286bd731ae7eab71.tar.gz
glibc-c3da4f0cba685e6918d2babb286bd731ae7eab71.tar.xz
glibc-c3da4f0cba685e6918d2babb286bd731ae7eab71.zip
Update.
2002-07-12  Philip Blundell  <philb@gnu.org>

	* sysdeps/generic/backtrace.c (FIRST_FRAME_POINTER): New macro.
	(__backtrace): Use it.
	* sysdeps/arm/frame.h (FIRST_FRAME_POINTER): Define.  [PR libc/2632]

2002-07-12  Philip Blundell  <philb@gnu.org>

	* sysdeps/arm/dl-machine.h (elf_machine_rel): Don't handle
	R_ARM_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC.  Only check
	for rtld map if neither RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined.
	(elf_machine_rela): Remove unused variable.

	* sysdeps/unix/sysv/linux/arm/Makefile [subdir=elf]
	(sysdep-rtld-routines, sysdep_routines, sysdep-dl-routines): Don't
	define.

2002-07-12  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/gconv-modules: Add aliases for ISO-8859-11.
Diffstat (limited to 'sysdeps/generic/backtrace.c')
-rw-r--r--sysdeps/generic/backtrace.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysdeps/generic/backtrace.c b/sysdeps/generic/backtrace.c
index 2579984747..f27f890bc4 100644
--- a/sysdeps/generic/backtrace.c
+++ b/sysdeps/generic/backtrace.c
@@ -1,5 +1,5 @@
 /* Return backtrace of current program state.  Generic version.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -58,6 +58,11 @@ extern void *__libc_stack_end;
 # define ADVANCE_STACK_FRAME(next) BOUNDED_1 ((struct layout *) (next))
 #endif
 
+/* By default, the frame pointer is just what we get from gcc.  */
+#ifndef FIRST_FRAME_POINTER
+# define FIRST_FRAME_POINTER  __builtin_frame_address (0)
+#endif
+
 int
 __backtrace (array, size)
      void **array;
@@ -68,7 +73,7 @@ __backtrace (array, size)
   void *__unbounded top_stack;
   int cnt = 0;
 
-  top_frame = __builtin_frame_address (0);
+  top_frame = FIRST_FRAME_POINTER;
   top_stack = CURRENT_STACK_FRAME;
 
   /* We skip the call to this function, it makes no sense to record it.  */