diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/fission-relative-dwo.c | 28 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp | 130 |
5 files changed, 175 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b378ccf..b418b75 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-04-07 Caroline Tice <cmtice@google.com> + + * dwarf2/read.c (try_open_dwop_file): Add path for the binary to + the search paths used resolve relative location of .dwo file. + 2021-04-07 Andrew Burgess <andrew.burgess@embecosm.com> * dwarf2/section.c (dwarf2_section_info::get_bfd_owner): Add an diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 43433f5..ed0d1c6 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -12723,6 +12723,13 @@ try_open_dwop_file (dwarf2_per_objfile *per_objfile, else search_path = debug_file_directory; + /* Add the path for the executable binary to the list of search paths. */ + std::string objfile_dir = ldirname (objfile_name (per_objfile->objfile)); + search_path_holder.reset (concat (objfile_dir.c_str (), + dirname_separator_string, + search_path, nullptr)); + search_path = search_path_holder.get (); + openp_flags flags = OPF_RETURN_REALPATH; if (is_dwp) flags |= OPF_SEARCH_IN_PATH; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ad97b66..c9c6063 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2021-04-07 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.dwarf2/fission-relative-dwo.c: New file. + * gdb.dwarf2/fission-relative-dwo.exp: New file. + +2021-04-07 Andrew Burgess <andrew.burgess@embecosm.com> + * gdb.dwarf2/fission-absolute-dwo.c: New file. * gdb.dwarf2/fission-absolute-dwo.exp: New file. * gdb.dwarf2/fission-base.exp: Use build_executable_and_dwo_files diff --git a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.c b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.c new file mode 100644 index 0000000..27f7f0d --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.c @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2021 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 3 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, see + <http://www.gnu.org/licenses/>. */ + +/* Our fake object. */ +int global_var[100]; + +int +main (int argc, char **argv) +{ + asm ("main_label: .globl main_label"); + + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp new file mode 100644 index 0000000..566d756 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/fission-relative-dwo.exp @@ -0,0 +1,130 @@ +# Copyright 2021 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 3 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, see <http://www.gnu.org/licenses/>. + +# This test checks that GDB can find the dwo file when the path to the +# dwo embedded in the executable is relative. + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile .c -dw.S + +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { + return -1 +} + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcfile gdb_test_file_name + + set debug_addr_base -1 + + # The information that will be split out into the .dwo file. + cu {fission 1} { + + # Capture the current index into .debug_addr so we can fill in + # DW_AT_GNU_addr_base later. + set debug_addr_base [debug_addr_label] + + compile_unit { + {language @DW_LANG_C} + {name ${srcfile}} + {DW_AT_comp_dir .} + {DW_AT_GNU_dwo_id 0x1234 DW_FORM_data8} + } { + declare_labels int4_type struct_type + + int4_type: DW_TAG_base_type { + {DW_AT_byte_size 4 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name integer} + } + + struct_type: DW_TAG_structure_type { + {DW_AT_name "foo_t"} + {DW_AT_byte_size 12 DW_FORM_sdata} + } { + member { + {name "aa"} + {type :$int4_type} + {data_member_location 0 data1} + } + member { + {name "bb"} + {type :$int4_type} + {data_member_location 4 data1} + } + member { + {name "cc"} + {type :$int4_type} + {data_member_location 8 data1} + } + } + + DW_TAG_variable { + {DW_AT_name global_var} + {DW_AT_type :$struct_type} + {DW_AT_location { + DW_OP_GNU_addr_index [gdb_target_symbol global_var] + } SPECIAL_expr} + {external 1 flag} + } + + subprogram { + {external 1 flag} + {DW_AT_name main DW_FORM_string} + {MACRO_AT_func {main}} + } + } + } + + # The information that will remain in the .o file. + cu {} { + compile_unit { + {DW_AT_GNU_dwo_name ${gdb_test_file_name}.dwo DW_FORM_strp} + {DW_AT_comp_dir .} + {DW_AT_GNU_dwo_id 0x1234 DW_FORM_data8} + {DW_AT_GNU_addr_base $debug_addr_base} + } { + # Nothing. + } + } +} + +# Compile both source files to create the executable. As we compile +# ASM_FILE we split out the debug information into the dwo file. +set object_file [standard_output_file ${testfile}.o] +if { [build_executable_and_dwo_files "${testfile}.exp" ${testfile} {nodebug} \ + [list $asm_file {nodebug split-dwo} ${object_file}] \ + [list $srcfile {nodebug}]] } { + perror "failed to compile ${gdb_test_file_name}" + return -1 +} + +# Now we can start GDB. +clean_restart ${testfile} + +if ![runto_main] { + return -1 +} + +# Print the type of global_var. This type information is entirely +# fictional, it only exists in the DWARF. If we don't have the DWARF +# information then there's no way we can print this. +gdb_test "p global_var" " = \\{aa = 0, bb = 0, cc = 0\\}" |