diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-21 17:53:06 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-21 17:53:06 +0100 |
| commit | 2e6135317db22a3c8d58776f10d75414b9685225 (patch) | |
| tree | 5ee08c296fddf8f681b065ac9b3b1383866da915 /dwflpp.cxx | |
| parent | 75dfa5cb9b3584995f9e634a6e769b8a1576bc0d (diff) | |
| parent | ea549ffc2915aa58861637472b12196222673fa2 (diff) | |
| download | systemtap-steved-2e6135317db22a3c8d58776f10d75414b9685225.tar.gz systemtap-steved-2e6135317db22a3c8d58776f10d75414b9685225.tar.xz systemtap-steved-2e6135317db22a3c8d58776f10d75414b9685225.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'dwflpp.cxx')
| -rw-r--r-- | dwflpp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1523,7 +1523,7 @@ dwflpp::emit_address (struct obstack *pool, Dwarf_Addr address) // This gives us the module name, and section name within the // module, for a kernel module (or other ET_REL module object). obstack_printf (pool, "({ unsigned long addr = 0; "); - obstack_printf (pool, "addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 "); ", + obstack_printf (pool, "addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 ", NULL); ", modname, secname, reloc_address); obstack_printf (pool, "addr; })"); } @@ -1537,7 +1537,7 @@ dwflpp::emit_address (struct obstack *pool, Dwarf_Addr address) // kernel will never move after being loaded (unlike modules and // user-space dynamic share libraries). obstack_printf (pool, "({ static unsigned long addr = 0; "); - obstack_printf (pool, "if (addr==0) addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 "); ", + obstack_printf (pool, "if (addr==0) addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 ", NULL); ", modname, secname, address); // PR10000 NB: not reloc_address obstack_printf (pool, "addr; })"); } @@ -1545,7 +1545,7 @@ dwflpp::emit_address (struct obstack *pool, Dwarf_Addr address) { enable_task_finder (sess); obstack_printf (pool, "({ unsigned long addr = 0; "); - obstack_printf (pool, "addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 "); ", + obstack_printf (pool, "addr = _stp_module_relocate (\"%s\",\"%s\",%#" PRIx64 ", current); ", modname, ".dynamic", reloc_address); obstack_printf (pool, "addr; })"); } |