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 fee3cf7521e8fdbfc22bc771d1c758ec887f6ec4..9bc1d9316ed45066ad1393f30f5454dd55dd05a4 100644 (file)
--- 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 89b21d5eb5043dc2fb78a90cf22127b606aeea51..77f794ff49ca1d3f8182e7fda160be03ebcd8562 100644 (file)
--- 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 2c8e767207cb836bfbcfad61d27b662bc7f69036..cc4181ea03f74d5335176f30b2e4ae2fd51ce0b6 100644 (file)
--- 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: