From: "Dmitry V. Levin" <ldv@altlinux.org>

Date: Mon, 6 Jan 2014 18:23:51 +0000

Subject: ld/testsuite: restore upstream default options

Many tests rely on upstream default options, so

restore them for the whole testsuite.

diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp

index defaced..defaced 100644

--- a/ld/testsuite/config/default.exp

+++ b/ld/testsuite/config/default.exp

@@ -22,7 +22,7 @@

 #

 if ![info exists ld] then {

-    set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]]

+    set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -O0"

 }

 if ![info exists as] then {

@@ -64,7 +64,7 @@ if {![file isdirectory tmpdir/ld]} then {

     catch "exec ln -s ld tmpdir/ld/collect-ld" status

     catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status

 }

-set gcc_B_opt "-B[pwd]/tmpdir/ld/"

+set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-O0"

 # load the linker path

 set ld_L_opt ""

@@ -303,7 +303,7 @@ if ![info exists ELFEDIT] then {

 }

 if ![info exists LD] then {

-    set LD [findfile $base_dir/ld-new ./ld-new [transform ld]]

+    set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -O0"

 }

 if ![info exists LDFLAGS] then {

diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp

index defaced..defaced 100644

--- a/ld/testsuite/ld-bootstrap/bootstrap.exp

+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp

@@ -99,7 +99,13 @@ foreach flags $test_flags {

     # This test can only be run if we have the ld build directory,

     # since we need the object files.

-    if {$ld != "$objdir/ld-new"} {

+    set ldexe $ld

+    set ldparm [string first " " $ld]

+    if { $ldparm > 0 } then {

+	set ldparm [expr $ldparm - 1]

+	set ldexe [string range $ld 0 $ldparm]

+    }

+    if {$ldexe != "$objdir/ld-new"} {

 	untested $testname

 	continue

     }