summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-06 18:50:20 +0000
committerhubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-06 18:50:20 +0000
commitbcac45515cd485917a18edadb476cefe505a11b0 (patch)
treef715c405e49bf93799f68e21cc9b75c63695969b
parentecaf5e86b5d603a8edd3199839458dd3977d1a25 (diff)
downloadgcc-bcac45515cd485917a18edadb476cefe505a11b0.tar.gz
PR lto/47188
* collect2.c (main): Do not enable LTOmode when plugin is active. * testsuite/gcc.dg/lto/pr47188_0.c: New testcase. * testsuite/gcc.dg/lto/pr47188_1.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168548 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/collect2.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/lto/pr47188_0.c7
-rw-r--r--gcc/testsuite/gcc.dg/lto/pr47188_1.c8
5 files changed, 26 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 539684e0f29..e6c4dee707a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-06 Jan Hubicka <jh@suse.cz>
+
+ PR lto/47188
+ * collect2.c (main): Do not enable LTOmode when plugin is active.
+
2011-01-06 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR other/45915
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 77f794ff49c..42e35b607ff 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1236,7 +1236,7 @@ main (int argc, char **argv)
#endif
}
vflag = debug;
- if (no_partition)
+ if (no_partition && lto_mode == LTO_MODE_WHOPR)
lto_mode = LTO_MODE_LTO;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f6e442355cc..739b65ed58c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-06 Jan Hubicka <jh@suse.cz>
+
+ * testsuite/gcc.dg/lto/pr47188_0.c: New testcase.
+ * testsuite/gcc.dg/lto/pr47188_1.c: New testcase.
+
2011-01-06 Daniel Franke <franke.daniel@gmail.com>
PR fortran/33117
diff --git a/gcc/testsuite/gcc.dg/lto/pr47188_0.c b/gcc/testsuite/gcc.dg/lto/pr47188_0.c
new file mode 100644
index 00000000000..ac9e03167fe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr47188_0.c
@@ -0,0 +1,7 @@
+/* { dg-lto-do assemble } */
+/* { dg-require-linker-plugin "" } */
+/* { dg-extra-ld-options "-fuse-linker-plugin -fwhole-program" } */
+int foo(void)
+{
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/lto/pr47188_1.c b/gcc/testsuite/gcc.dg/lto/pr47188_1.c
new file mode 100644
index 00000000000..f18f4db381a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr47188_1.c
@@ -0,0 +1,8 @@
+/* { dg-options "-fno-lto" } */
+
+extern int foo(void);
+
+int main(void)
+{
+ return foo();
+}