diff --git a/ChangeLog b/ChangeLog
index cd093a5c92..b52961bbc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
+	(FIRST_FRAME_POINTER): Define.
+
+2008-05-09  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/sparc/sparc64/backtrace.c: New file.
+
 2008-05-14  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/sparc/machine-gmon.h: New file.
diff --git a/sysdeps/sparc/sparc64/backtrace.c b/sysdeps/sparc/sparc64/backtrace.c
new file mode 100644
index 0000000000..6d7e429e2e
--- /dev/null
+++ b/sysdeps/sparc/sparc64/backtrace.c
@@ -0,0 +1,58 @@
+/* Return backtrace of current program state.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David S. Miller <davem@davemloft.net>
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <execinfo.h>
+#include <stddef.h>
+#include <bp-checks.h>
+#include <sysdep.h>
+
+struct layout
+{
+  unsigned long locals[8];
+  unsigned long ins[6];
+  unsigned long next;
+  void *__unbounded return_address;
+};
+
+int
+__backtrace (void **array, int size)
+{
+  struct layout *current;
+  unsigned long fp;
+  int count;
+
+  asm volatile ("flushw");
+  asm volatile ("mov %%fp, %0" : "=r"(fp));
+  current = (struct layout *__unbounded) (fp + STACK_BIAS);
+  current = BOUNDED_1 (current);
+
+  for (count = 0; count < size; count++)
+    {
+      array[count] = current->return_address;
+      if (!current->next)
+	break;
+      current = (struct layout *__unbounded) (current->next + STACK_BIAS);
+      current = BOUNDED_1 (current);
+    }
+
+  return count;
+}
+weak_alias (__backtrace, backtrace)
+libc_hidden_def (__backtrace)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
index 2c2770d071..59656978b8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
@@ -20,6 +20,9 @@
 #define SIGCONTEXT struct sigcontext *
 #define SIGCONTEXT_EXTRA_ARGS
 #define GET_PC(__ctx)	((void *) ((__ctx)->si_regs.pc))
+#define FIRST_FRAME_POINTER \
+  ({ void *ret;							\
+     asm volatile ("ta 3; add %%fp, 56, %0" : "=r" (ret)); ret; })
 #define ADVANCE_STACK_FRAME(__next) \
 	((void *) (((unsigned *)(__next))+14))