From: Georg-Johann Lay <avr@gjlay.de>
Date: Wed, 8 Jan 2020 09:41:59 +0000 (+0000)
Subject: Add -nodevicespecs option for avr.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3e131c9bb937c2a0b8c0ac606da181d9f771746;p=gcc.git

Add -nodevicespecs option for avr.

gcc/
	Add -nodevicespecs option for avr.

	PR target/93182
	* config/avr/avr.opt (-nodevicespecs): New driver option.
	* config/avr/driver-avr.c (avr_devicespecs_file): Only issue
	"-specs=device-specs/..." if that option is not set.
	* doc/invoke.texi (AVR Options) <-nodevicespecs>: Document.

From-SVN: r279995
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12bf61ffe25..005e2aa39ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,16 @@
 2020-01-08  Georg-Johann Lay  <avr@gjlay.de>
 
-	Implement 64-bit double functions.
+	Add -nodevicespecs option for avr.
+
+	PR target/93182
+	* config/avr/avr.opt (-nodevicespecs): New driver option.
+	* config/avr/driver-avr.c (avr_devicespecs_file): Only issue
+	"-specs=device-specs/..." if that option is not set.
+	* doc/invoke.texi (AVR Options) <-nodevicespecs>: Document.
+
+2020-01-08  Georg-Johann Lay  <avr@gjlay.de>
+
+	Implement 64-bit double functions for avr.
 
 	PR target/92055
 	* config.gcc (tm_defines) [target=avr]: Support --with-libf7,
diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt
index c56abcad939..fac3114690f 100644
--- a/gcc/config/avr/avr.opt
+++ b/gcc/config/avr/avr.opt
@@ -127,6 +127,10 @@ nodevicelib
 Driver Target Report RejectNegative
 Do not link against the device-specific library lib<MCU>.a.
 
+nodevicespecs
+Driver Target Report RejectNegative
+Do not use the device-specific specs file device-specs/specs-<MCU>.
+
 Enum
 Name(avr_bits_e) Type(int)
 Available BITS selections:
diff --git a/gcc/config/avr/driver-avr.c b/gcc/config/avr/driver-avr.c
index 9cb3093abe9..84389047890 100644
--- a/gcc/config/avr/driver-avr.c
+++ b/gcc/config/avr/driver-avr.c
@@ -26,8 +26,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "tm.h"
 
-// Remove -nodevicelib from the command line if not needed
-#define X_NODEVLIB "%<nodevicelib"
+// Remove -nodevicelib and -nodevicespecs from the command line if not needed.
+#define X_NODEVLIB "%<nodevicelib %<nodevicespecs"
 
 static const char dir_separator_str[] = { DIR_SEPARATOR, 0 };
 
@@ -102,8 +102,8 @@ avr_devicespecs_file (int argc, const char **argv)
         return X_NODEVLIB;
       }
 
-  return concat ("-specs=device-specs", dir_separator_str, "specs-",
-                 mmcu, "%s"
+  return concat ("%{!nodevicespecs:-specs=device-specs", dir_separator_str,
+				 "specs-", mmcu, "%s} %<nodevicespecs"
 #if defined (WITH_AVRLIBC)
                  " %{mmcu=avr*:" X_NODEVLIB "} %{!mmcu=*:" X_NODEVLIB "}",
 #else