This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch,avr,installed] ad PR65296: Adjust specs to new avr-libc layout as of #44574


...I went ahead and installed as

http://gcc.gnu.org/r222179

It will be backported to 5.2 as soon as 5.1 is open for patches again (assuming RM won't approve this one for 5.1).


As far as I can tell, all works fine now, even with install-paths containing spaces and LTO.


Johann


2015-04-17  Sivanupandi Pitchumani <Pitchumani.Sivanupandi@atmel.com>

	PR target/65296
	* config/avr/gen-avr-mmcu-specs.c (*avrlibc_startfile): Adjust
	to new AVR-LibC file layout (bug #44574).
	(*avrlibc_devicelib): Same.
	* config/avr/avr-mcus.def: Adjust comments.
	* config/avr/avr.opt (nodevicelib): Adjust help.



Index: config/avr/gen-avr-mmcu-specs.c
===================================================================
--- config/avr/gen-avr-mmcu-specs.c     (revision 222178)
+++ config/avr/gen-avr-mmcu-specs.c     (revision 222179)
@@ -171,11 +171,11 @@ bool is_arch = NULL == mcu->macro;
   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:-l%s}", mcu->name);
       fprintf (f, "\n\n");
     }
 #endif  // WITH_AVRLIBC
Index: config/avr/avr-mcus.def
===================================================================
--- config/avr/avr-mcus.def     (revision 222178)
+++ config/avr/avr-mcus.def     (revision 222179)
@@ -44,8 +44,8 @@ Before including this file, define a mac
                      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
+                     - to link the device library by means of -l<NAME>

        ARCH          Specifies the multilib variant together with AVR_SHORT_SP

Index: config/avr/avr.opt
===================================================================
--- config/avr/avr.opt  (revision 222178)
+++ config/avr/avr.opt  (revision 222179)
@@ -97,4 +97,4 @@ Allow to use truncation instead of round

 nodevicelib
 Driver Target Report RejectNegative
-Do not link against the device-specific library libdev.a
+Do not link against the device-specific library lib<MCU>.a


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]