diff mbox

[avr,applied] ad PR65296: Allow specifying the same MCU more than once.

Message ID 55105AF5.4040004@gjlay.de
State New
Headers show

Commit Message

Georg-Johann Lay March 23, 2015, 6:27 p.m. UTC 
http://gcc.gnu.org/r221602

Applied this path so that it is allowed to specify the same -mmcu=MCU more than 
once.  This is the easiest way to manage situation where it is hard to control 
the command line arguments, in particular when the compiler is called by linker 
plugin.


Johann

	PR target/65296
	* config/avr/driver-avr.c (avr_devicespecs_file): Allow to specify
	the same -mmcu=MCU more than once.
diff mbox

Patch

Index: config/avr/driver-avr.c
===================================================================
--- config/avr/driver-avr.c     (revision 221601)
+++ config/avr/driver-avr.c     (revision 221602)
@@ -55,9 +55,10 @@  avr_diagnose_devicespecs_error (const ch

  /* Implement spec function `device-specs-file´.

-   Compose -specs=<specs-file-name>.  If everything went well then argv[0]
-   is the inflated specs directory and argv[1] is a device or core name as
-   supplied to -mmcu=*.  */
+   Compose -specs=<specs-file-name>%s.  If everything went well then argv[0]
+   is the inflated (absolute) specs directory and argv[1] is a device or
+   core name as supplied by -mmcu=*.  When building GCC the path might
+   be relative.  */

  const char*
  avr_devicespecs_file (int argc, const char **argv)
@@ -82,13 +83,19 @@  avr_devicespecs_file (int argc, const ch
        mmcu = AVR_MMCU_DEFAULT;
        break;

-    case 2:
+    default:
        mmcu = argv[1];
-      break;

-    default:
-      error ("specified option %qs more than once", "-mmcu=");
-      return X_NODEVLIB;
+      // Allow specifying the same MCU more than once.
+
+      for (int i = 2; i < argc; i++)
+        if (0 != strcmp (mmcu, argv[i]))
+          {
+            error ("specified option %qs more than once", "-mmcu");
+            return X_NODEVLIB;
+          }
+
+      break;
      }

    specfile_name = concat (argv[0], dir_separator_str, "specs-", mmcu, NULL);