From: Andi Kleen <ak@linux.intel.com>
Date: Sun, 19 Dec 2010 19:36:25 +0000 (+0000)
Subject: Fix -fno-lto (PR lto/46905)
X-Git-Tag: releases/gcc-4.6.0~1742
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=595c8dfa0bc38bda6e4b652b047bc47be851da19;p=thirdparty%2Fgcc.git

Fix -fno-lto (PR lto/46905)

gcc/

2010-12-19  Andi Kleen	<ak@linux.intel.com>

	PR lto/46905
	* collect2.c (main): Handle -fno-lto.
	* opts.c (common_handle_option): Handle -fno-lto.

From-SVN: r168071
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fee3cf7521e8..9bc1d9316ed4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-19  Andi Kleen	<ak@linux.intel.com>
+
+	PR lto/46905
+	* collect2.c (main): Handle -fno-lto.
+	* opts.c (common_handle_option): Handle -fno-lto.
+
 2010-12-19  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR target/46729
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 89b21d5eb504..77f794ff49ca 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1211,6 +1211,8 @@ main (int argc, char **argv)
         else if ((! strncmp (argv[i], "-flto=", 6)
 		  || ! strcmp (argv[i], "-flto")) && ! use_plugin)
 	  lto_mode = LTO_MODE_WHOPR;
+	else if (!strncmp (argv[i], "-fno-lto", 8))
+	  lto_mode = LTO_MODE_NONE;
         else if (! strcmp (argv[i], "-plugin"))
 	  {
 	    use_plugin = true;
diff --git a/gcc/opts.c b/gcc/opts.c
index 2c8e767207cb..cc4181ea03f7 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1670,7 +1670,7 @@ common_handle_option (struct gcc_options *opts,
       break;
 
     case OPT_flto:
-      opts->x_flag_lto = "";
+      opts->x_flag_lto = value ? "" : NULL;
       break;
 
     case OPT_w: