From: Georg-Johann Lay <avr@gjlay.de>
Date: Thu, 9 Apr 2015 11:37:11 +0000 (+0000)
Subject: re PR target/65296 ([avr] fix various issues with specs file generation)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3184f36f4f6fa41fe94afe42f11cc0c4c01c5478;p=gcc.git

re PR target/65296 ([avr] fix various issues with specs file generation)

	PR target/65296
	* config/avr/driver-avr.c (avr_devicespecs_file): Don't specify a
	device specs file if "device-specs%s" didn't resolve to a path.

From-SVN: r221947
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3bf58e4515..36e027add25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-09  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/65296
+	* config/avr/driver-avr.c (avr_devicespecs_file): Don't specify a
+	device specs file if "device-specs%s" didn't resolve to a path.
+
 2015-04-09  Kirill Yukhin  <kirill.yukhin@intel.com>
 
 	PR target/65676
diff --git a/gcc/config/avr/driver-avr.c b/gcc/config/avr/driver-avr.c
index 4890a39b489..75d7e6f6791 100644
--- a/gcc/config/avr/driver-avr.c
+++ b/gcc/config/avr/driver-avr.c
@@ -80,6 +80,19 @@ avr_devicespecs_file (int argc, const char **argv)
       return X_NODEVLIB;
 
     case 1:
+      if (0 == strcmp ("device-specs", argv[0]))
+        {
+          /* FIXME:  This means "device-specs%s" from avr.h:DRIVER_SELF_SPECS
+             has not been resolved to a path.  That case can occur when the
+             c++ testsuite is run from the build directory.  DejaGNU's
+             libgloss.exp:get_multilibs runs $compiler without -B, i.e.runs
+             xgcc without specifying a prefix.  Without any prefix, there is
+             no means to find out where the specs files might be located.
+             get_multilibs runs xgcc --print-multi-lib, hence we don't actually
+             need information form a specs file and may skip it here.  */
+          return X_NODEVLIB;
+        }
+
       mmcu = AVR_MMCU_DEFAULT;
       break;