From 818f79f66bf25893345147c0a573ac855fcc9cf3 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 9 Jan 2007 22:43:09 +0000 Subject: [PATCH] 2007-01-09 Jan Kratochvil * symtab.c (matching_bfd_sections): Fix VMA matching for prelinked objects. * gdb.base/relativedebug.c, gdb.base/relativedebug.exp: New files. --- gdb/ChangeLog | 5 ++ gdb/symtab.c | 5 +- gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.base/relativedebug.c | 37 ++++++++++++ gdb/testsuite/gdb.base/relativedebug.exp | 71 ++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.base/relativedebug.c create mode 100644 gdb/testsuite/gdb.base/relativedebug.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9deb737464c..49ce8c92d5b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2007-01-09 Jan Kratochvil + + * symtab.c (matching_bfd_sections): Fix VMA matching for + prelinked objects. + 2007-01-09 Jan Kratochvil * minsyms.c (lookup_minimal_symbol_by_pc_section): Handle diff --git a/gdb/symtab.c b/gdb/symtab.c index 1fc435ec443..4a5b1e2fd78 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -739,8 +739,11 @@ matching_bfd_sections (asection *first, asection *second) if (bfd_get_section_size (first) != bfd_get_section_size (second)) return 0; + /* In-memory addresses may start at a different offset, relativize them. */ if (bfd_get_section_vma (first->owner, first) - != bfd_get_section_vma (second->owner, second)) + - bfd_get_start_address (first->owner) + != bfd_get_section_vma (second->owner, second) + - bfd_get_start_address (second->owner)) return 0; if (bfd_get_section_name (first->owner, first) == NULL diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f62bef293f8..28e959e3d78 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-01-09 Jan Kratochvil + + * gdb.base/relativedebug.c, gdb.base/relativedebug.exp: New files. + 2007-01-09 Jan Kratochvil * gdb.arch/i386-size-overlap.c, gdb.arch/i386-size-overlap.exp: New. diff --git a/gdb/testsuite/gdb.base/relativedebug.c b/gdb/testsuite/gdb.base/relativedebug.c new file mode 100644 index 00000000000..60f4ea93f95 --- /dev/null +++ b/gdb/testsuite/gdb.base/relativedebug.c @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2007 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#include +#include +#include + + +static void handler (int signo) +{ + abort (); +} + +int main (void) +{ + signal (SIGALRM, handler); + alarm (1); + pause (); + pause (); + return 0; +} diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp new file mode 100644 index 00000000000..d686fbe84ab --- /dev/null +++ b/gdb/testsuite/gdb.base/relativedebug.exp @@ -0,0 +1,71 @@ +# Copyright 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +if $tracelevel then { + strace $tracelevel +} + +set testfile relativedebug +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + untested "Couldn't compile test program" + return -1 +} + +# Get things started. + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +runto_main + +# pause () -> SIGALRM -> handler () -> abort () +gdb_test "continue" "Program received signal SIGABRT.*" + +# Backtracing through pause broke if glibc has been prelinked, +# because the separate debug files in /usr/lib/debug had different +# base addresses. + +# incorrect (#6): +# (gdb) bt +# #0 0x00325402 in __kernel_vsyscall () +# #1 0x00718f20 in *__GI_raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 +# #2 0x0071a801 in *__GI_abort () at abort.c:88 +# #3 0x0804841f in handler (signo=14) at ./gdb.base/relativedebug.c:27 +# #4 +# #5 0x00325402 in __kernel_vsyscall () +# #6 0x0077ebc6 in ?? () from /lib/i686/nosegneg/libc.so.6 +# #7 0x08048455 in main () at ./gdb.base/relativedebug.c:34 +# (gdb) + +# correct (#6): +# (gdb) bt +# #0 0x00b33402 in __kernel_vsyscall () +# #1 0x00718f20 in *__GI_raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 +# #2 0x0071a801 in *__GI_abort () at abort.c:88 +# #3 0x0804841f in handler (signo=14) at ./gdb.base/relativedebug.c:27 +# #4 +# #5 0x00b33402 in __kernel_vsyscall () +# #6 0x0077ebc6 in __pause_nocancel () from /lib/i686/nosegneg/libc.so.6 +# #7 0x08048455 in main () at ./gdb.base/relativedebug.c:34 +# (gdb) + +gdb_test "bt" \ + ".*\[^a-zA-Z\]pause\[^a-zA-Z\].*" \ + "pause found in backtrace" -- 2.30.2