From 15bdc138573610dbc40be680480af1d63bd0ae5d Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Sun, 19 Apr 2009 16:38:41 +0200
Subject: [PATCH] Handle .absolute and .dynamic (user space) addresses in
 adjustStartLoc.

* runtime/unwind.c (adjustStartLoc): .absolute sections don't need
  adjustment, .dynamic sections need the section addr to be added.
---
 runtime/unwind.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/runtime/unwind.c b/runtime/unwind.c
index 41af72a74..7914c77dd 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -435,12 +435,18 @@ adjustStartLoc (unsigned long startLoc,
 		struct _stp_module *m,
 		struct _stp_section *s)
 {
-  if (startLoc && (strcmp (m->name, "kernel") != 0))
-    {
-      startLoc = _stp_module_relocate (m->name, s->name,
-				       startLoc);
-      startLoc -= m->dwarf_module_base;
-    }
+  /* XXX - some, or all, of this should really be done by
+     _stp_module_relocate. */
+  if (startLoc == 0
+      || strcmp (m->name, "kernel")  == 0
+      || strcmp (s->name, ".absolute") == 0)
+    return startLoc;
+
+  if (strcmp (s->name, ".dynamic") == 0)
+    return startLoc + s->addr;
+
+  startLoc = _stp_module_relocate (m->name, s->name, startLoc);
+  startLoc -= m->dwarf_module_base;
   return startLoc;
 }
 
-- 
2.43.5