diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/print-file-var.exp | 18 |
2 files changed, 16 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 330a5eb..6948378 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2020-11-02 Gary Benson <gbenson@redhat.com> + * gdb.base/print-file-var.exp (test): Separate compiler and + linker options, and build using build_executable_from_specs + to accommodate this. + +2020-11-02 Gary Benson <gbenson@redhat.com> + * lib/gdb.exp (gdb_compile): Inhibit passing "-x c++" for .c files compiled as C++ with Clang if any shared libraries are specified. diff --git a/gdb/testsuite/gdb.base/print-file-var.exp b/gdb/testsuite/gdb.base/print-file-var.exp index 22df9f1..62e5f23 100644 --- a/gdb/testsuite/gdb.base/print-file-var.exp +++ b/gdb/testsuite/gdb.base/print-file-var.exp @@ -56,22 +56,24 @@ proc test {hidden dlopen version_id_main lang} { return -1 } - set main_opts [list debug shlib=${libobj1} $lang] + set main_opts [list debug $lang] + set link_opts [list debug shlib=${libobj1}] if {$dlopen} { - lappend main_opts "shlib_load" \ - "additional_flags=-DSHLIB_NAME=\"$libobj2\"" + lappend main_opts "additional_flags=-DSHLIB_NAME=\"$libobj2\"" + lappend link_opts "shlib_load" } else { - lappend main_opts "shlib=${libobj2}" + lappend link_opts "shlib=${libobj2}" } lappend main_opts "additional_flags=-DVERSION_ID_MAIN=$version_id_main" - if { [gdb_compile "${srcdir}/${subdir}/${main}.c" \ - [standard_output_file ${executable}] \ - executable \ + if { [build_executable_from_specs ${main} \ + $executable \ + $link_opts \ + ${main}.c \ $main_opts] - != ""} { + != 0 } { return -1 } |