summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-21 10:36:13 +0000
committergjl <gjl@138bc75d-0d04-0410-961f-82ee72b054a4>2016-06-21 10:36:13 +0000
commitb1d666b956ed884bd2481f7722a56fa1b446964d (patch)
tree3690c4073f851510434dba7cae5767cd387a29bc
parent3bdae8d2e87e14b908f8fc60aa96c2030140ab32 (diff)
downloadgcc-b1d666b956ed884bd2481f7722a56fa1b446964d.tar.gz
PR target/30417
* config/avr/gen-avr-mmcu-specs.c (print_mcu): [*link_data_start]: Wrap -Tdata into %{!Tdata:...}. [*link_text_start]: Wrap -Ttext into %{!Ttext:...}. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@237639 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/avr/gen-avr-mmcu-specs.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7927454fdba..7112623940c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
2016-06-21 Georg-Johann Lay <avr@gjlay.de>
+ PR target/30417
+ * config/avr/gen-avr-mmcu-specs.c (print_mcu):
+ [*link_data_start]: Wrap -Tdata into %{!Tdata:...}.
+ [*link_text_start]: Wrap -Ttext into %{!Ttext:...}.
+
+2016-06-21 Georg-Johann Lay <avr@gjlay.de>
+
PR target/71103
* config/avr/avr.md (movqi): Only handle loading subreg:qi of
constant addresses if can_create_pseudo_p.
diff --git a/gcc/config/avr/gen-avr-mmcu-specs.c b/gcc/config/avr/gen-avr-mmcu-specs.c
index de8680a8a1b..fabe8c2c59b 100644
--- a/gcc/config/avr/gen-avr-mmcu-specs.c
+++ b/gcc/config/avr/gen-avr-mmcu-specs.c
@@ -27,7 +27,7 @@
#include "avr-devices.c"
-// Get rid of "defaults.h". We just need tm.h for `WITH_AVRLIBS' and
+// Get rid of "defaults.h". We just need tm.h for `WITH_AVRLIBC' and
// and `WITH_RTEMS'. */
#define GCC_DEFAULTS_H
@@ -242,12 +242,13 @@ print_mcu (const avr_mcu_t *mcu)
fprintf (f, "*link_data_start:\n");
if (mcu->data_section_start
!= arch->default_data_section_start)
- fprintf (f, "\t-Tdata 0x%lX", 0x800000UL + mcu->data_section_start);
+ fprintf (f, "\t%%{!Tdata:-Tdata 0x%lX}",
+ 0x800000UL + mcu->data_section_start);
fprintf (f, "\n\n");
fprintf (f, "*link_text_start:\n");
if (mcu->text_section_start != 0x0)
- fprintf (f, "\t-Ttext 0x%lX", 0UL + mcu->text_section_start);
+ fprintf (f, "\t%%{!Ttext:-Ttext 0x%lX}", 0UL + mcu->text_section_start);
fprintf (f, "\n\n");
}