diff options
Diffstat (limited to 'gold')
-rw-r--r-- | gold/object.cc | 2 | ||||
-rwxr-xr-x | gold/testsuite/debug_msg.sh | 12 | ||||
-rwxr-xr-x | gold/testsuite/x32_overflow_pc32.sh | 2 | ||||
-rwxr-xr-x | gold/testsuite/x86_64_overflow_pc32.sh | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gold/object.cc b/gold/object.cc index ccb7405..77b2690 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -3358,7 +3358,7 @@ Relocate_info<size, big_endian>::location(size_t, off_t offset) const if (info.enclosing_symbol_type == elfcpp::STT_FUNC) ret += _("function "); ret += info.enclosing_symbol_name; - return ret; + ret += ":"; } ret += "("; diff --git a/gold/testsuite/debug_msg.sh b/gold/testsuite/debug_msg.sh index b808fb8..51e8a83 100755 --- a/gold/testsuite/debug_msg.sh +++ b/gold/testsuite/debug_msg.sh @@ -55,9 +55,9 @@ check_missing() # We don't know how the compiler might order these variables, so we # can't test for the actual offset from .data, hence the regexp. -check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn1()'" -check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn2()'" -check debug_msg.err "debug_msg.o:debug_msg.cc:badref1: error: undefined reference to 'undef_int'" +check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array:(.*): error: undefined reference to 'undef_fn1()'" +check debug_msg.err "debug_msg.o:debug_msg.cc:fn_array:(.*): error: undefined reference to 'undef_fn2()'" +check debug_msg.err "debug_msg.o:debug_msg.cc:badref1:(.*): error: undefined reference to 'undef_int'" # These tests check only for the source file's file name (not the complete # path) because use of -fdebug-prefix-map may change the path to the source @@ -93,9 +93,9 @@ check debug_msg.err "odr_violation2.cc:3[0-7]" # Check for the same error messages when using --compressed-debug-sections. if test -r debug_msg_cdebug.err then - check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn1()'" - check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array: error: undefined reference to 'undef_fn2()'" - check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:badref1: error: undefined reference to 'undef_int'" + check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array:(.*): error: undefined reference to 'undef_fn1()'" + check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:fn_array:(.*): error: undefined reference to 'undef_fn2()'" + check debug_msg_cdebug.err "debug_msg_cdebug.o:debug_msg.cc:badref1:(.*): error: undefined reference to 'undef_int'" check debug_msg_cdebug.err ".*/debug_msg.cc:50: error: undefined reference to 'undef_fn1()'" check debug_msg_cdebug.err ".*/debug_msg.cc:55: error: undefined reference to 'undef_fn2()'" check debug_msg_cdebug.err ".*/debug_msg.cc:4[356]: error: undefined reference to 'undef_fn1()'" diff --git a/gold/testsuite/x32_overflow_pc32.sh b/gold/testsuite/x32_overflow_pc32.sh index d0a4cf0..6da575e 100755 --- a/gold/testsuite/x32_overflow_pc32.sh +++ b/gold/testsuite/x32_overflow_pc32.sh @@ -37,6 +37,6 @@ check() # We don't know how the compiler might order these variables, so we # can't test for the actual offset from .data, hence the regexp. -check x86_64_overflow_pc32.err "function bar: error: relocation overflow" +check x86_64_overflow_pc32.err "function bar:(.*): error: relocation overflow" exit 0 diff --git a/gold/testsuite/x86_64_overflow_pc32.sh b/gold/testsuite/x86_64_overflow_pc32.sh index d0a4cf0..6da575e 100755 --- a/gold/testsuite/x86_64_overflow_pc32.sh +++ b/gold/testsuite/x86_64_overflow_pc32.sh @@ -37,6 +37,6 @@ check() # We don't know how the compiler might order these variables, so we # can't test for the actual offset from .data, hence the regexp. -check x86_64_overflow_pc32.err "function bar: error: relocation overflow" +check x86_64_overflow_pc32.err "function bar:(.*): error: relocation overflow" exit 0 |