summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/ChangeLog5
-rw-r--r--runtime/runtime.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index d794b4a1..6ff15b8a 100644
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,5 +1,10 @@
2008-09-10 Mark Wielaard <mjw@redhat.com>
+ * runtime.h (CONFIG_FRAME_POINTER): Don't enable when
+ STP_USE_DWARF_UNWINDER is already defined.
+
+2008-09-10 Mark Wielaard <mjw@redhat.com>
+
* sym.h (_stp_module): Add module_base field.
* unwind.c (adjustStartLoc): New function.
(_stp_search_unwind_hdr): Use adjustStartLoc.
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 52d689a3..db793aa5 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -68,10 +68,12 @@ static struct
#ifdef CONFIG_FRAME_POINTER
/* Just because frame pointers are available does not mean we can trust them. */
+#ifndef STP_USE_DWARF_UNWINDER
#if defined (__i386__) || defined (__arm__)
#define STP_USE_FRAME_POINTER
#endif
#endif
+#endif
/* dwarf unwinder only tested so far on i386 and x86_64,
but globally disabled for now */