diff options
| author | Sivanupandi Pitchumani <Pitchumani.Sivanupandi@atmel.com> | 2015-04-17 13:54:16 +0000 |
|---|---|---|
| committer | Georg-Johann Lay <gjl@gcc.gnu.org> | 2015-04-17 13:54:16 +0000 |
| commit | c11cdefbd1b1170deaaea321f919e3d04cbf25af (patch) | |
| tree | 867d4afdc5829095bc1bf50f6f5a0db611d0efcb | |
| parent | abd0cdc9c07c92d6cab15afc4fd38945d536751b (diff) | |
| download | gcc-c11cdefbd1b1170deaaea321f919e3d04cbf25af.zip gcc-c11cdefbd1b1170deaaea321f919e3d04cbf25af.tar.gz gcc-c11cdefbd1b1170deaaea321f919e3d04cbf25af.tar.bz2 | |
re PR target/65296 ([avr] fix various issues with specs file generation)
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.
From-SVN: r222179
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/avr/avr-mcus.def | 4 | ||||
| -rw-r--r-- | gcc/config/avr/avr.opt | 2 | ||||
| -rw-r--r-- | gcc/config/avr/gen-avr-mmcu-specs.c | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b900410..275e4e0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +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. + 2015-04-17 Alan Lawrence <alan.lawrence@arm.com> * config/aarch64/arm_neon.h (vdup_n_f32): Remove forward declaration. diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def index ce4b782..821f597 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 + - to link the device library by means of -l<NAME> 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..7e32ce5 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<MCU>.a diff --git a/gcc/config/avr/gen-avr-mmcu-specs.c b/gcc/config/avr/gen-avr-mmcu-specs.c index 3594d8a..eda8d86 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:-l%s}", mcu->name); fprintf (f, "\n\n"); } #endif // WITH_AVRLIBC |