summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <[email protected]>2012-10-10 09:31:00 -0700
committerRoland McGrath <[email protected]>2012-10-10 09:31:00 -0700
commit1e651dcb4a484a65d9c230b1f53ca5d4fafb4c2f (patch)
treea87ae33d664ee83b7e8f68a3a3985d5ca06de050
parentb5c0b037203eea0dc41f93900330522fe821eca9 (diff)
parent387654d501eabd17d46e1a7d2a2f27388ed52943 (diff)
Merge branch 'jankratochvil/vdso-bias'
-rw-r--r--libdwfl/ChangeLog5
-rw-r--r--libdwfl/dwfl_segment_report_module.c1
-rw-r--r--tests/ChangeLog5
-rwxr-xr-xtests/run-addrname-test.sh6
-rw-r--r--tests/testfile65.bz2bin0 -> 4674 bytes
5 files changed, 17 insertions, 0 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 4a5f4eb1..189d3b71 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,10 @@
2012-10-10 Jan Kratochvil <[email protected]>
+ * dwfl_segment_report_module.c (dwfl_segment_report_module):
+ Initialize mod->MAIN_BIAS.
+
+2012-10-10 Jan Kratochvil <[email protected]>
+
* dwfl_module_addrsym.c (dwfl_module_addrsym): New function
binding_value. Use it for both zero and non-zero size symbols
comparisons.
diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c
index afe9da1b..7cf74994 100644
--- a/libdwfl/dwfl_segment_report_module.c
+++ b/libdwfl/dwfl_segment_report_module.c
@@ -650,6 +650,7 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name,
mod->main.elf = elf;
mod->main.vaddr = module_start - bias;
mod->main.address_sync = module_address_sync;
+ mod->main_bias = bias;
}
return finish ();
diff --git a/tests/ChangeLog b/tests/ChangeLog
index ac1a1f87..2495fb58 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,10 @@
2012-10-10 Jan Kratochvil <[email protected]>
+ * run-addrname-test.sh: New test for core vDSO bias.
+ * testfile65.bz2: New file.
+
+2012-10-10 Jan Kratochvil <[email protected]>
+
* run-addrname-test.sh: New test for symbol preferences.
* testfile64.bz2: New file.
diff --git a/tests/run-addrname-test.sh b/tests/run-addrname-test.sh
index 034cf6f0..4feb1936 100755
--- a/tests/run-addrname-test.sh
+++ b/tests/run-addrname-test.sh
@@ -292,4 +292,10 @@ l0local2
??:0
EOF
+testfiles testfile65
+testrun_compare ../src/addr2line -S --core=testfile65 0x7fff94bffa30 <<\EOF
+__vdso_time
+??:0
+EOF
+
exit 0
diff --git a/tests/testfile65.bz2 b/tests/testfile65.bz2
new file mode 100644
index 00000000..5e925f87
--- /dev/null
+++ b/tests/testfile65.bz2
Binary files differ