AVR: target/107201: Make -nodevicelib work for all devices.

	driver-avr.cc contains a spec that discriminates between cores
	and devices by means of a mmcu=avr* spec pattern.  This does not
	work for new devices like AVR128* which also start with mmcu=avr
	like all cores do.  The patch uses a new spec function in order to
	tell apart cores from devices.

gcc/
	PR target/107201
	* config/avr/avr.h (EXTRA_SPEC_FUNCTIONS): Add no-devlib, avr_no_devlib.
	* config/avr/driver-avr.cc (avr_no_devlib): New function.
	(avr_devicespecs_file): Use it to remove -nodevicelib from the
	options for cores only.
	* config/avr/avr-arch.h (avr_get_parch): New prototype.
	* config/avr/avr-devices.cc (avr_get_parch): New function.

(cherry picked from commit 86fac7ee1688bdec245a43f6d2ab49fb238892e4)

diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h
index 79445fe7987b6b9abaa3b7f6adee7456d6eb2727..f48514fd46517280b91a0a880d1d4c28edf9865e 100644 (file)
--- a/gcc/config/avr/avr-arch.h
+++ b/gcc/config/avr/avr-arch.h
@@ -195,6 +195,7 @@ typedef struct
 
 extern const avr_arch_t avr_arch_types[];
 extern const avr_arch_t *avr_arch;
+extern const avr_arch_t *avr_get_parch (const char *mcu);
 
 extern const avr_mcu_t avr_mcu_types[];
 

diff --git a/gcc/config/avr/avr-devices.cc b/gcc/config/avr/avr-devices.cc
index 4b638b48fcc6b16b69859a4fd87df5abd229b1bd..fa080d409b3667c0fda4acb02119bdc182f481c5 100644 (file)
--- a/gcc/config/avr/avr-devices.cc
+++ b/gcc/config/avr/avr-devices.cc
@@ -153,4 +153,20 @@ avr_inform_core_architectures (void)
   free (archs);
 }
 
+
+/* When MCU names a core arch like "avr5", then return a pointer to the
+   respective entry in avr_arch_types[].  Otherwise, return NULL.  */
+
+const avr_arch_t *
+avr_get_parch (const char *mcu)
+{
+  for (size_t i = 0; i < ARRAY_SIZE (avr_arch_types); ++i)
+    {
+      if (strcmp (mcu, avr_arch_types[i].name) == 0)
+       return & avr_arch_types[i];
+    }
+
+  return NULL;
+}
+
 #endif // IN_GEN_AVR_MMCU_TEXI

diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 8e7e00db13b995620684d7386d630446040a22da..063ffb9d31c771ffe0e50beb658d985b1c6c8e2b 100644 (file)
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -500,9 +500,11 @@ typedef struct avr_args
 
 extern const char *avr_devicespecs_file (int, const char**);
 extern const char *avr_double_lib (int, const char**);
+extern const char *avr_no_devlib (int, const char**);
 
 #define EXTRA_SPEC_FUNCTIONS                            \
   { "double-lib", avr_double_lib },                     \
+  { "no-devlib", avr_no_devlib },                       \
   { "device-specs-file", avr_devicespecs_file },
 
 /* Driver self specs has lmited functionality w.r.t. '%s' for dynamic specs.

diff --git a/gcc/config/avr/driver-avr.cc b/gcc/config/avr/driver-avr.cc
index 3728bcf7bc5799076e307a8cef78bbb130a318bc..09ec4e588eed317388a1a41e5292fe3997c29f62 100644 (file)
--- a/gcc/config/avr/driver-avr.cc
+++ b/gcc/config/avr/driver-avr.cc
@@ -103,9 +103,14 @@ avr_devicespecs_file (int argc, const char **argv)
       }
 
   return concat ("%{!nodevicespecs:-specs=device-specs", dir_separator_str,
-                                "specs-", mmcu, "%s} %<nodevicespecs"
+                "specs-", mmcu, "%s} %<nodevicespecs"
 #if defined (WITH_AVRLIBC)
-                 " %{mmcu=avr*:" X_NODEVLIB "} %{!mmcu=*:" X_NODEVLIB "}",
+                // Return X_NODEVLIB when we are compiling for a core.  As
+                // there are devices like AVR128DA32, a simple mmcu=avr* to
+                // discriminate between cores and devices ceased to work,
+                // hence use spec function no-devlib=avr_no_devlib from below.
+                // See also PR107201.
+                " %{mmcu=avr*:%:no-devlib(avr%*)} %{!mmcu=*:" X_NODEVLIB "}",
 #else
                  " " X_NODEVLIB,
 #endif
@@ -113,10 +118,26 @@ avr_devicespecs_file (int argc, const char **argv)
 }
 
 
+/* Return X_NODEVLIB when ARGV[] contains a core like "avr5",
+   otherwise return "".  */
+
+const char *
+avr_no_devlib (int argc, const char **argv)
+{
+  for (int i = 0; i < argc; ++i)
+    {
+      if (avr_get_parch (argv[i]))
+       return X_NODEVLIB;
+    }
+
+  return "";
+}
+
+
 /* Re-build the -mdouble= and -mlong-double= options.  This is needed
    because these options are not independent of each other.  */
 
-const char*
+const char *
 avr_double_lib (int argc, const char **argv)
 {
 #if defined (WITH_DOUBLE64)