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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 539684e0f299726c8fd0bdb08173c3a38c18c834..e6c4dee707ac043f5e5ddb5ccbff249dc7fabab1 100644 (file)
--- 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 77f794ff49ca1d3f8182e7fda160be03ebcd8562..42e35b607ff883563927c50dcba53ea280905b39 100644 (file)
--- 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 f6e442355cca4efabc885bb7f5cbb9d223c04866..739b65ed58cd000214f964aa8cfbc5f7b8a28193 100644 (file)
--- 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 (file)
index 0000000..ac9e031
--- /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 (file)
index 0000000..f18f4db
--- /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();
+}