aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2013-04-03 11:44:41 +0000
committerAlan Modra <amodra@gmail.com>2013-04-03 11:44:41 +0000
commit203f0950a35c87f17016045f1cd5a0460b445532 (patch)
tree5a7a1e3538fcb5eb1ae50228ad310958f42de5d4
parent3758b5ce9576f35df7434aa17a3298cae2ced74d (diff)
downloadgdb-203f0950a35c87f17016045f1cd5a0460b445532.zip
gdb-203f0950a35c87f17016045f1cd5a0460b445532.tar.gz
gdb-203f0950a35c87f17016045f1cd5a0460b445532.tar.bz2
PR ld/15227
* ld-plugin/lto.exp (PR ld/12942 (3)): Remove file name and line number from regexp. (PR ld/15146 (2)): Similarly. * ld-plugin/pr12942a.cc (main): Use __builtin_abort.
-rw-r--r--ld/testsuite/ChangeLog8
-rw-r--r--ld/testsuite/ld-plugin/lto.exp4
-rw-r--r--ld/testsuite/ld-plugin/pr12942a.cc4
3 files changed, 11 insertions, 5 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 869bb70..493084d 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-03 Alan Modra <amodra@gmail.com>
+
+ PR ld/15227
+ * ld-plugin/lto.exp (PR ld/12942 (3)): Remove file name and
+ line number from regexp.
+ (PR ld/15146 (2)): Similarly.
+ * ld-plugin/pr12942a.cc (main): Use __builtin_abort.
+
2013-03-30 Alan Modra <amodra@gmail.com>
PR ld/15323
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 7ffe955..09474a6 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -295,7 +295,7 @@ if { [is_elf_format]
run_cc_link_tests $lto_link_elf_tests
set testname "PR ld/15146 (2)"
set exec_output [run_host_cmd "$CC" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin -Wl,-rpath-link,. -Wl,--no-copy-dt-needed-entries -Wl,--no-as-needed tmpdir/pr15146d.o tmpdir/pr15146c.so"]
- if { [ regexp "ltrans.o: undefined reference to symbol 'xxx'" $exec_output ] } {
+ if { [ regexp "undefined reference to symbol 'xxx'" $exec_output ] } {
pass $testname
} {
fail $testname
@@ -314,7 +314,7 @@ if {![string match "" $catch_output]} {
# Check expected LTO linker errors.
set testname "PR ld/12942 (3)"
set exec_output [run_host_cmd "$CXX" "$gcc_gas_flag $gcc_ld_flag -O2 -flto -fuse-linker-plugin tmpdir/pr12942b.o tmpdir/pr12942a.o"]
-if { [ regexp "pr12942a.h:7: undefined reference to `link_error\\(\\)'" $exec_output ] } {
+if { [ regexp "undefined reference to `link_error\\(\\)'" $exec_output ] } {
pass $testname
} {
fail $testname
diff --git a/ld/testsuite/ld-plugin/pr12942a.cc b/ld/testsuite/ld-plugin/pr12942a.cc
index 1a18404..d5328dd 100644
--- a/ld/testsuite/ld-plugin/pr12942a.cc
+++ b/ld/testsuite/ld-plugin/pr12942a.cc
@@ -1,15 +1,13 @@
#include <stdio.h>
#include "pr12942a.h"
-extern "C" void abort ();
-
test_t b(void);
int
main(void)
{
if (test != b ())
- abort ();
+ __builtin_abort ();
printf ("OK\n");
return 0;