From: trippels <trippels@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 24 Oct 2014 06:39:24 +0000 (+0000)
Subject: Fix bootstrap/PR63632
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28ed1b8973e8bf29b50a83601e3933b093cba0fb;p=thirdparty%2Fgcc.git

Fix bootstrap/PR63632

r216566 (r216568 for 4.9 branch) added %{fno-lto} to LINK_COMMAND_SPEC.
However the linker doesn't understand -fno-lto and errors out.
This causes an LTO/PGO bootstrap failure, because -fno-lto is used
during STAGEprofile.
Fixed by filtering out -fno-lto in collect2.c.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216613 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cefe8ffab749..857acd07f82e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+	PR bootstrap/63632
+	* collect2.c (main): Filter out -fno-lto.
+
 2014-10-24  Martin Liska  <mliska@suse.cz>
 
 	* ipa-icf.c (sem_item_optimizer::parse_nonsingleton_classes): Guard
diff --git a/gcc/collect2.c b/gcc/collect2.c
index c54e6fb51578..7c067ffcafbb 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1311,6 +1311,12 @@ main (int argc, char **argv)
 		  ld1--;
 		  ld2--;
 		}
+	      else if (strncmp (arg, "-fno-lto", 8) == 0)
+		{
+		  /* Do not pass -fno-lto to the linker. */
+		  ld1--;
+		  ld2--;
+		}
 #ifdef TARGET_AIX_VERSION
 	      else
 		{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88e08e0442e6..3b7dbdca53af 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24  Markus Trippelsdorf  <markus@trippelsdorf.de>
+
+	PR bootstrap/63632
+	* g++.dg/torture/pr63632.C: New test.
+
 2014-10-23  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR c++/63619
diff --git a/gcc/testsuite/g++.dg/torture/pr63632.C b/gcc/testsuite/g++.dg/torture/pr63632.C
new file mode 100644
index 000000000000..48cd8692412a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr63632.C
@@ -0,0 +1,5 @@
+// PR bootstrap/63632
+// { dg-do link }
+// { dg-options "-fno-lto" }
+
+int main () {}