RE: [patch,avr]: Part2: Fix various problems with specs and specs file generation.

["Sivanupandi, Pitchumani" <Pitchumani.Sivanupandi@atmel.com>]

[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]

> -----Original Message-----
> From: gcc-patches-owner@gcc.gnu.org [mailto:gcc-patches-
> owner@gcc.gnu.org] On Behalf Of Sivanupandi, Pitchumani
> Sent: Thursday, April 09, 2015 6:26 PM
> To: Georg-Johann Lay; Denis Chertykov
> Cc: GCC Patches; Joerg Wunsch; Selvaraj, Senthil_Kumar
> Subject: RE: [patch,avr]: Part2: Fix various problems with specs and specs
> file generation.
...
> >
> > If the device libs are moved, all the ~200 .dev/<device> directories
> > will contain just 1 file each: crt1.o.  Is it much work to tidy that
> > up?  (For example by renaming to, say, crt<device>.o and moving
> them
> > to a common place or to their natural multilib location.)
> 
> No, It is possible to do with the same patch.
> I'll rename crt1.o to crt<device>.o and move it to multilib location.

Hi Johann,

This is done.
https://savannah.nongnu.org/bugs/?44574

Attached a patch for corresponding changes in gcc.

gcc/ChangeLog
* config/avr/avr-mcus.def: Change startup and device lib name
to crt<device>.o and lib<device>.a respectively.
* config/avr/avr.opt: Update device lib name.
* config/avr/gen-avr-mmcu-specs.c (print_mcu): Update start file name
and device lib name.

Regards,
Pitchumani

[-- Attachment #2: Change-crt-device-lib-name.patch --]
[-- Type: application/octet-stream, Size: 1868 bytes --]

diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def
index ce4b782..8526578 100644
--- a/gcc/config/avr/avr-mcus.def
+++ b/gcc/config/avr/avr-mcus.def
@@ -44,8 +44,8 @@
                      used by DRIVER_SELF_SPECS and gen-avr-mmcu-specs.c for
                      - the name of the device specific specs file
                        in -specs=device-specs/spec-<NAME>
-                     - the name of the startup file dev/<NAME>/crt1.o
-                     - the name of the device library dev/<NAME>/libdev.a
+                     - the name of the startup file crt<NAME>.o
+                     - the name of the device library lib<NAME>.a
 
        ARCH          Specifies the multilib variant together with AVR_SHORT_SP
 
diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt
index 5de5f90..1986c4f 100644
--- a/gcc/config/avr/avr.opt
+++ b/gcc/config/avr/avr.opt
@@ -97,4 +97,4 @@ Allow to use truncation instead of rounding towards 0 for fractional int types
 
 nodevicelib
 Driver Target Report RejectNegative
-Do not link against the device-specific library libdev.a
+Do not link against the device-specific library lib<device>.a
diff --git a/gcc/config/avr/gen-avr-mmcu-specs.c b/gcc/config/avr/gen-avr-mmcu-specs.c
index 3594d8a..0931920 100644
--- a/gcc/config/avr/gen-avr-mmcu-specs.c
+++ b/gcc/config/avr/gen-avr-mmcu-specs.c
@@ -171,11 +171,11 @@ print_mcu (const avr_mcu_t *mcu)
   if (is_device)
     {
       fprintf (f, "*avrlibc_startfile:\n");
-      fprintf (f, "\tdev/%s/crt1.o%%s", mcu->name);
+      fprintf (f, "\tcrt%s.o%%s", mcu->name);
       fprintf (f, "\n\n");
 
       fprintf (f, "*avrlibc_devicelib:\n");
-      fprintf (f, "\t%%{!nodevicelib:dev/%s/libdev.a%%s}", mcu->name);
+      fprintf (f, "\t%%{!nodevicelib:lib%s.a%%s}", mcu->name);
       fprintf (f, "\n\n");
     }
 #endif  // WITH_AVRLIBC