From: Alan Modra <amodra@gmail.com>
Date: Thu, 11 Aug 2016 14:12:05 +0000 (+0930)
Subject: Fix ERROR: target-cc does not exist
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8be1e36919a884152d7115f4f4b8c0cfcf086a1f;p=binutils-gdb.git

Fix ERROR: target-cc does not exist

	PR ld/20436
	* testsuite/lib/ld-lib.exp (at_least_gcc_version): Don't ignore
	remote_exec status.
	(check_gcc_plugin_enabled): Likewise.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6e9565c393d..35e066e8dfd 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-11  Alan Modra  <amodra@gmail.com>
+
+	PR ld/20436
+	* testsuite/lib/ld-lib.exp (at_least_gcc_version): Don't ignore
+	remote_exec status.
+	(check_gcc_plugin_enabled): Likewise.  Revert previous patch.
+
 2016-08-11  Nick Clifton  <nickc@redhat.com>
 
 	PR ld/20436
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 23055bef337..7b190bee2a6 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -35,9 +35,12 @@ proc at_least_gcc_version { major minor } {
 	set CC [find_gcc]
     }
     if { $CC == "" } {
-      return 0
+	return 0
     }
     set state [remote_exec host $CC --version]
+    if { [lindex $state 0] != 0 } {
+	return 0;
+    }
     set tmp "[lindex $state 1]\n"
     # Look for (eg) 4.6.1 in the version output.
     set ver_re "\[^\\.0-9\]+(\[1-9\]\[0-9\]*)\\.(\[0-9\]+)(?:\\.\[0-9\]+)?"
@@ -1816,13 +1819,13 @@ proc check_gcc_plugin_enabled { } {
 	set CC [find_gcc]
     }
     if { $CC == ""} {
-      return 0
-    }
-    if { ![is_remote host] && [which $CC] == 0 } then {
-      return 0
+	return 0
     }
     set state [remote_exec host $CC -v]
-    for { set i 0 } { $i < [llength $state] } { incr i } {
+    if { [lindex $state 0] != 0 } {
+	return 0;
+    }
+    for { set i 1 } { $i < [llength $state] } { incr i } {
 	set v [lindex $state $i]
 	if { [ string match "*--disable-plugin*" $v ] } {
 	    verbose "plugin is disabled by $v"