aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2014-10-24 06:39:24 +0000
committerMarkus Trippelsdorf <trippels@gcc.gnu.org>2014-10-24 06:39:24 +0000
commitfa608e77c23322260187ad098859ea1b2ba3b322 (patch)
tree2c02a7576b870f559cb78d1d963fc61ae2709e65 /gcc
parentf1c859ee84ad2d44fa9fc1867b183c47ee1d0489 (diff)
downloadgcc-fa608e77c23322260187ad098859ea1b2ba3b322.zip
gcc-fa608e77c23322260187ad098859ea1b2ba3b322.tar.gz
gcc-fa608e77c23322260187ad098859ea1b2ba3b322.tar.bz2
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. From-SVN: r216613
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/collect2.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/torture/pr63632.C5
4 files changed, 21 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cefe8ff..857acd0 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 c54e6fb..7c067ff 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 88e08e0..3b7dbdc 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 0000000..48cd869
--- /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 () {}