From dbc37f892b730f7fb0177770be3e3eb67ad36149 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 31 Jan 2002 03:57:52 +0000 Subject: [PATCH] * ld-scripts/crossref.exp: Allow foo to have a leading dot. * ld-scripts/cross1.t: Add .opd. * ld-undefined/undefined.exp: Allow leading dot on sym names. * lib/ld-lib.exp (default_ld_nm): Strip leading dots from syms. --- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-scripts/cross1.t | 1 + ld/testsuite/ld-scripts/crossref.exp | 2 +- ld/testsuite/ld-undefined/undefined.exp | 4 ++-- ld/testsuite/lib/ld-lib.exp | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 2035cbc5338..eff1c9ab185 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-01-31 Alan Modra + + * ld-scripts/crossref.exp: Allow foo to have a leading dot. + * ld-scripts/cross1.t: Add .opd. + * ld-undefined/undefined.exp: Allow leading dot on sym names. + * lib/ld-lib.exp (default_ld_nm): Strip leading dots from syms. + 2002-01-29 Chris Demetriou * ld-mips-elf/emrelocs-eb.d: New file to test --embedded-relocs. diff --git a/ld/testsuite/ld-scripts/cross1.t b/ld/testsuite/ld-scripts/cross1.t index 7636b787496..11efa134e5a 100644 --- a/ld/testsuite/ld-scripts/cross1.t +++ b/ld/testsuite/ld-scripts/cross1.t @@ -2,6 +2,7 @@ NOCROSSREFS ( .text .data ) SECTIONS { .toc : { *(.toc) } + .opd : { *(.opd) } .text : { tmpdir/cross1.o } .data : { tmpdir/cross2.o } } diff --git a/ld/testsuite/ld-scripts/crossref.exp b/ld/testsuite/ld-scripts/crossref.exp index a2ba5ceae15..da5d7ba56b3 100644 --- a/ld/testsuite/ld-scripts/crossref.exp +++ b/ld/testsuite/ld-scripts/crossref.exp @@ -54,7 +54,7 @@ if [string match "" $exec_output] then { fail $test1 } else { verbose -log "$exec_output" - if [regexp "prohibited cross reference from .* to `foo' in" $exec_output] { + if [regexp "prohibited cross reference from .* to `.*foo' in" $exec_output] { pass $test1 } else { fail $test1 diff --git a/ld/testsuite/ld-undefined/undefined.exp b/ld/testsuite/ld-undefined/undefined.exp index e47a2016bb3..0829b010372 100644 --- a/ld/testsuite/ld-undefined/undefined.exp +++ b/ld/testsuite/ld-undefined/undefined.exp @@ -61,7 +61,7 @@ proc checkund { string testname } { } } -set mu "undefined reference to `this_function_is_not_defined'" +set mu "undefined reference to `*this_function_is_not_defined'" checkund $mu $testund # ARM PE defaults to using stabs debugging, which we can't handle for @@ -94,7 +94,7 @@ setup_xfail "sh-*-*" # Just doesn't work for PA ELF. No clue why. setup_xfail "hppa*-*-*elf*" -set ml "undefined.c:9: undefined reference to `this_function_is_not_defined'" +set ml "undefined.c:9: undefined reference to `*this_function_is_not_defined'" # With targets that use elf/dwarf2, such as the arm-elf and thumb-elf # toolchains, the code in bfd/elf.c:_bfd_elf_find_nearest_line() is called # in order to locate the file name/line number where the undefined diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 841b14bf684..06583e55bb6 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -307,7 +307,7 @@ proc default_ld_nm { nm nmflags object } { set file [open tmpdir/nm.out r] while { [gets $file line] != -1 } { verbose "$line" 2 - if [regexp "^(\[0-9a-fA-F\]+) \[a-zA-Z0-9\] (.+)$" $line whole value name] { + if [regexp "^(\[0-9a-fA-F\]+) \[a-zA-Z0-9\] \\.*(.+)$" $line whole value name] { set name [string trimleft $name "_"] verbose "Setting nm_output($name) to 0x$value" 2 set nm_output($name) 0x$value -- 2.30.2