|
| 1 | +diff -ur ../gcc-3.4.6.orig/gcc/config/avr/avr.c ./gcc/config/avr/avr.c |
| 2 | +--- ../gcc-3.4.6.orig/gcc/config/avr/avr.c Sun Mar 20 22:14:28 2005 |
| 3 | ++++ ./gcc/config/avr/avr.c Sun Mar 19 23:06:42 2006 |
| 4 | +@@ -175,6 +175,18 @@ |
| 5 | + { "at90c8534", 2, "__AVR_AT90C8534__" }, |
| 6 | + { "at90s8535", 2, "__AVR_AT90S8535__" }, |
| 7 | + { "at86rf401", 2, "__AVR_AT86RF401__" }, |
| 8 | ++ { "attiny261", 2, "__AVR_ATtiny261__" }, |
| 9 | ++ { "attiny461", 2, "__AVR_ATtiny461__" }, |
| 10 | ++ { "attiny861", 2, "__AVR_ATtiny861__" }, |
| 11 | ++ /* Classic + MOVW, <= 8K. */ |
| 12 | ++ { "attiny13", 2, "__AVR_ATtiny13__" }, |
| 13 | ++ { "attiny2313", 2, "__AVR_ATtiny2313__" }, |
| 14 | ++ { "attiny24", 2, "__AVR_ATtiny24__" }, |
| 15 | ++ { "attiny44", 2, "__AVR_ATtiny44__" }, |
| 16 | ++ { "attiny84", 2, "__AVR_ATtiny84__" }, |
| 17 | ++ { "attiny25", 2, "__AVR_ATtiny25__" }, |
| 18 | ++ { "attiny45", 2, "__AVR_ATtiny45__" }, |
| 19 | ++ { "attiny85", 2, "__AVR_ATtiny85__" }, |
| 20 | + /* Classic, > 8K. */ |
| 21 | + { "avr3", 3, NULL }, |
| 22 | + { "atmega103", 3, "__AVR_ATmega103__" }, |
| 23 | +@@ -185,19 +197,50 @@ |
| 24 | + /* Enhanced, <= 8K. */ |
| 25 | + { "avr4", 4, NULL }, |
| 26 | + { "atmega8", 4, "__AVR_ATmega8__" }, |
| 27 | ++ { "atmega48", 4, "__AVR_ATmega48__" }, |
| 28 | ++ { "atmega88", 4, "__AVR_ATmega88__" }, |
| 29 | + { "atmega8515", 4, "__AVR_ATmega8515__" }, |
| 30 | + { "atmega8535", 4, "__AVR_ATmega8535__" }, |
| 31 | ++ { "at90pwm2", 4, "__AVR_AT90PWM2__" }, |
| 32 | ++ { "at90pwm3", 4, "__AVR_AT90PWM3__" }, |
| 33 | + /* Enhanced, > 8K. */ |
| 34 | + { "avr5", 5, NULL }, |
| 35 | + { "atmega16", 5, "__AVR_ATmega16__" }, |
| 36 | + { "atmega161", 5, "__AVR_ATmega161__" }, |
| 37 | + { "atmega162", 5, "__AVR_ATmega162__" }, |
| 38 | + { "atmega163", 5, "__AVR_ATmega163__" }, |
| 39 | ++ { "atmega164p",5, "__AVR_ATmega164P__" }, |
| 40 | ++ { "atmega165", 5, "__AVR_ATmega165__" }, |
| 41 | ++ { "atmega165p", 5,"__AVR_ATmega165P__" }, |
| 42 | ++ { "atmega168", 5, "__AVR_ATmega168__" }, |
| 43 | + { "atmega169", 5, "__AVR_ATmega169__" }, |
| 44 | ++ { "atmega169p", 5,"__AVR_ATmega169P__" }, |
| 45 | + { "atmega32", 5, "__AVR_ATmega32__" }, |
| 46 | + { "atmega323", 5, "__AVR_ATmega323__" }, |
| 47 | ++ { "atmega324p",5, "__AVR_ATmega324P__" }, |
| 48 | ++ { "atmega325", 5, "__AVR_ATmega325__" }, |
| 49 | ++ { "atmega3250", 5, "__AVR_ATmega3250__" }, |
| 50 | ++ { "atmega329", 5, "__AVR_ATmega329__" }, |
| 51 | ++ { "atmega3290", 5, "__AVR_ATmega3290__" }, |
| 52 | ++ { "atmega406", 5, "__AVR_ATmega406__" }, |
| 53 | ++ { "atmega640", 5, "__AVR_ATmega640__" }, |
| 54 | + { "atmega64", 5, "__AVR_ATmega64__" }, |
| 55 | ++ { "atmega644", 5, "__AVR_ATmega644__" }, |
| 56 | ++ { "atmega644p",5, "__AVR_ATmega644P__" }, |
| 57 | ++ { "atmega645", 5, "__AVR_ATmega645__" }, |
| 58 | ++ { "atmega6450", 5, "__AVR_ATmega6450__" }, |
| 59 | ++ { "atmega649", 5, "__AVR_ATmega649__" }, |
| 60 | ++ { "atmega6490", 5, "__AVR_ATmega6490__" }, |
| 61 | + { "atmega128", 5, "__AVR_ATmega128__" }, |
| 62 | ++ { "atmega1280",5, "__AVR_ATmega1280__" }, |
| 63 | ++ { "atmega1281",5, "__AVR_ATmega1281__" }, |
| 64 | ++ { "at90can32", 5, "__AVR_AT90CAN32__" }, |
| 65 | ++ { "at90can64", 5, "__AVR_AT90CAN64__" }, |
| 66 | ++ { "at90can128", 5, "__AVR_AT90CAN128__" }, |
| 67 | ++ { "at90usb646", 5, "__AVR_AT90USB646__" }, |
| 68 | ++ { "at90usb647", 5, "__AVR_AT90USB647__" }, |
| 69 | ++ { "at90usb1286", 5, "__AVR_AT90USB1286__" }, |
| 70 | ++ { "at90usb1287", 5, "__AVR_AT90USB1287__" }, |
| 71 | + { "at94k", 5, "__AVR_AT94K__" }, |
| 72 | + /* Assembler only. */ |
| 73 | + { "avr1", 1, NULL }, |
| 74 | +diff -ur ../gcc-3.4.6.orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h |
| 75 | +--- ../gcc-3.4.6.orig/gcc/config/avr/avr.h Tue Mar 9 04:00:15 2004 |
| 76 | ++++ ./gcc/config/avr/avr.h Sun Mar 19 23:08:23 2006 |
| 77 | +@@ -2351,12 +2351,13 @@ |
| 78 | + Do not define this macro if it does not need to do anything. */ |
| 79 | + |
| 80 | + #define LINK_SPEC " %{!mmcu*:-m avr2}\ |
| 81 | +-%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \ |
| 82 | +-%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\ |
| 83 | ++%{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \ |
| 84 | ++%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny24|mmcu=attiny44|mmcu=attiny84|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85|mmcu=attiny261|mmcu=attiny461|mmcu=attiny861:-m avr2}\ |
| 85 | + %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\ |
| 86 | +-%{mmcu=atmega8*:-m avr4}\ |
| 87 | +-%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\ |
| 88 | +-%{mmcu=atmega64|mmcu=atmega128|mmcu=atmega162|mmcu=atmega169: -Tdata 0x800100} " |
| 89 | ++%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\ |
| 90 | ++%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega406|mmcu=atmega64*|mmcu=atmega128*|mmcu=at90can*|mmcu=at90usb*|mmcu=at94k:-m avr5}\ |
| 91 | ++%{mmcu=atmega324*|mmcu=atmega325|mmcu=atmega3250|mmcu=atmega329|mmcu=atmega3290|mmcu=atmega406|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega644*|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega649|mmcu=atmega6490|mmcu=atmega128|mmcu=at90can*|mmcu=atmega162|mmcu=atmega164*|mmcu=atmega165*|mmcu=atmega168|mmcu=atmega169*|mmcu=at90pwm*|mmcu=at90usb*: -Tdata 0x800100}\ |
| 92 | ++%{mmcu=atmega640|mmcu=atmega1280|mmcu=atmega1281: -Tdata 0x800200} " |
| 93 | + |
| 94 | + /* A C string constant that tells the GCC driver program options to |
| 95 | + pass to the linker. It can also specify how to translate options |
| 96 | +@@ -2365,7 +2366,7 @@ |
| 97 | + Do not define this macro if it does not need to do anything. */ |
| 98 | + |
| 99 | + #define LIB_SPEC \ |
| 100 | +- "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lc }}}" |
| 101 | ++ "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}" |
| 102 | + /* Another C string constant used much like `LINK_SPEC'. The |
| 103 | + difference between the two is that `LIB_SPEC' is used at the end |
| 104 | + of the command given to the linker. |
| 105 | +@@ -2377,7 +2378,7 @@ |
| 106 | + /* No libstdc++ for now. Empty string doesn't work. */ |
| 107 | + |
| 108 | + #define LIBGCC_SPEC \ |
| 109 | +- "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lgcc }}}" |
| 110 | ++ "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lgcc }}}}}" |
| 111 | + /* Another C string constant that tells the GCC driver program how |
| 112 | + and when to place a reference to `libgcc.a' into the linker |
| 113 | + command line. This constant is placed both before and after the |
| 114 | +@@ -2421,23 +2422,65 @@ |
| 115 | + %{mmcu=at90c8534:crtc8534.o%s} \ |
| 116 | + %{mmcu=at90s8535:crts8535.o%s} \ |
| 117 | + %{mmcu=at86rf401:crt86401.o%s} \ |
| 118 | ++%{mmcu=attiny13:crttn13.o%s} \ |
| 119 | ++%{mmcu=attiny2313:crttn2313.o%s} \ |
| 120 | ++%{mmcu=attiny24:crttn24.o%s} \ |
| 121 | ++%{mmcu=attiny44:crttn44.o%s} \ |
| 122 | ++%{mmcu=attiny84:crttn84.o%s} \ |
| 123 | ++%{mmcu=attiny25:crttn25.o%s} \ |
| 124 | ++%{mmcu=attiny45:crttn45.o%s} \ |
| 125 | ++%{mmcu=attiny85:crttn85.o%s} \ |
| 126 | ++%{mmcu=attiny261:crttn261.o%s} \ |
| 127 | ++%{mmcu=attiny461:crttn461.o%s} \ |
| 128 | ++%{mmcu=attiny861:crttn861.o%s} \ |
| 129 | + %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \ |
| 130 | + %{mmcu=atmega603:crtm603.o%s} \ |
| 131 | + %{mmcu=at43usb320:crt43320.o%s} \ |
| 132 | + %{mmcu=at43usb355:crt43355.o%s} \ |
| 133 | + %{mmcu=at76c711:crt76711.o%s} \ |
| 134 | + %{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \ |
| 135 | ++%{mmcu=atmega48:crtm48.o%s} \ |
| 136 | ++%{mmcu=atmega88:crtm88.o%s} \ |
| 137 | + %{mmcu=atmega8515:crtm8515.o%s} \ |
| 138 | + %{mmcu=atmega8535:crtm8535.o%s} \ |
| 139 | ++%{mmcu=at90pwm2:crt90pwm2.o%s} \ |
| 140 | ++%{mmcu=at90pwm3:crt90pwm3.o%s} \ |
| 141 | + %{mmcu=atmega16:crtm16.o%s} \ |
| 142 | + %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \ |
| 143 | + %{mmcu=atmega162:crtm162.o%s} \ |
| 144 | + %{mmcu=atmega163:crtm163.o%s} \ |
| 145 | ++%{mmcu=atmega164p:crtm164p.o%s} \ |
| 146 | ++%{mmcu=atmega165:crtm165.o%s} \ |
| 147 | ++%{mmcu=atmega165p:crtm165p.o%s} \ |
| 148 | ++%{mmcu=atmega168:crtm168.o%s} \ |
| 149 | + %{mmcu=atmega169:crtm169.o%s} \ |
| 150 | ++%{mmcu=atmega169p:crtm169p.o%s} \ |
| 151 | + %{mmcu=atmega32:crtm32.o%s} \ |
| 152 | + %{mmcu=atmega323:crtm323.o%s} \ |
| 153 | ++%{mmcu=atmega324p:crtm324p.o%s} \ |
| 154 | ++%{mmcu=atmega325:crtm325.o%s} \ |
| 155 | ++%{mmcu=atmega3250:crtm3250.o%s} \ |
| 156 | ++%{mmcu=atmega329:crtm329.o%s} \ |
| 157 | ++%{mmcu=atmega3290:crtm3290.o%s} \ |
| 158 | ++%{mmcu=atmega406:crtm406.o%s} \ |
| 159 | + %{mmcu=atmega64:crtm64.o%s} \ |
| 160 | ++%{mmcu=atmega640:crtm640.o%s} \ |
| 161 | ++%{mmcu=atmega644:crtm644.o%s} \ |
| 162 | ++%{mmcu=atmega644p:crtm644p.o%s} \ |
| 163 | ++%{mmcu=atmega645:crtm645.o%s} \ |
| 164 | ++%{mmcu=atmega6450:crtm6450.o%s} \ |
| 165 | ++%{mmcu=atmega649:crtm649.o%s} \ |
| 166 | ++%{mmcu=atmega6490:crtm6490.o%s} \ |
| 167 | + %{mmcu=atmega128:crtm128.o%s} \ |
| 168 | ++%{mmcu=atmega1280:crtm1280.o%s} \ |
| 169 | ++%{mmcu=atmega1281:crtm1281.o%s} \ |
| 170 | ++%{mmcu=at90can32:crtcan32.o%s} \ |
| 171 | ++%{mmcu=at90can64:crtcan64.o%s} \ |
| 172 | ++%{mmcu=at90can128:crtcan128.o%s} \ |
| 173 | ++%{mmcu=at90usb646:crtusb646.o%s} \ |
| 174 | ++%{mmcu=at90usb647:crtusb647.o%s} \ |
| 175 | ++%{mmcu=at90usb1286:crtusb1286.o%s} \ |
| 176 | ++%{mmcu=at90usb1287:crtusb1287.o%s} \ |
| 177 | + %{mmcu=at94k:crtat94k.o%s}" |
| 178 | + |
| 179 | + #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS}, |
| 180 | +diff -ur ../gcc-3.4.6.orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr |
| 181 | +--- ../gcc-3.4.6.orig/gcc/config/avr/t-avr Mon Apr 25 06:17:34 2005 |
| 182 | ++++ ./gcc/config/avr/t-avr Sun Mar 19 23:08:56 2006 |
| 183 | +@@ -46,12 +46,31 @@ |
| 184 | + mmcu?avr3=mmcu?at43usb320 mmcu?avr3=mmcu?at43usb355 \ |
| 185 | + mmcu?avr3=mmcu?at76c711 \ |
| 186 | + mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega8535 \ |
| 187 | +- mmcu?avr4=mmcu?atmega8 \ |
| 188 | ++ mmcu?avr4=mmcu?atmega8 mmcu?avr4=mmcu?atmega48 \ |
| 189 | ++ mmcu?avr4=mmcu?atmega88 \ |
| 190 | ++ mmcu?avr4=mmcu?at90pwm2 mmcu?avr4=mmcu?at90pwm3 \ |
| 191 | + mmcu?avr5=mmcu?atmega161 mmcu?avr5=mmcu?atmega162 \ |
| 192 | +- mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega169 \ |
| 193 | ++ mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega164p \ |
| 194 | ++ mmcu?avr5=mmcu?atmega165 mmcu?avr5=mmcu?atmega165p \ |
| 195 | ++ mmcu?avr5=mmcu?atmega168 mmcu?avr5=mmcu?atmega169 \ |
| 196 | ++ mmcu?avr5=mmcu?atmega169p \ |
| 197 | + mmcu?avr5=mmcu?atmega16 \ |
| 198 | +- mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega32 \ |
| 199 | +- mmcu?avr5=mmcu?atmega64 mmcu?avr5=mmcu?atmega128 \ |
| 200 | ++ mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega324p \ |
| 201 | ++ mmcu?avr5=mmcu?atmega325 mmcu?avr5=mmcu?atmega3250 \ |
| 202 | ++ mmcu?avr5=mmcu?atmega329 mmcu?avr5=mmcu?atmega3290 \ |
| 203 | ++ mmcu?avr5=mmcu?atmega32 \ |
| 204 | ++ mmcu?avr5=mmcu?atmega406 \ |
| 205 | ++ mmcu?avr5=mmcu?atmega640 mmcu?avr5=mmcu?atmega644 \ |
| 206 | ++ mmcu?avr5=mmcu?atmega644p mmcu?avr5=mmcu?atmega645 \ |
| 207 | ++ mmcu?avr5=mmcu?atmega6450 mmcu?avr5=mmcu?atmega649 \ |
| 208 | ++ mmcu?avr5=mmcu?atmega6490 mmcu?avr5=mmcu?atmega64 \ |
| 209 | ++ mmcu?avr5=mmcu?atmega128 \ |
| 210 | ++ mmcu?avr5=mmcu?atmega1280 mmcu?avr5=mmcu?atmega1281 \ |
| 211 | ++ mmcu?avr5=mmcu?at90can32 \ |
| 212 | ++ mmcu?avr5=mmcu?at90can64 \ |
| 213 | ++ mmcu?avr5=mmcu?at90can128 \ |
| 214 | ++ mmcu?avr5=mmcu?at90usb646 mmcu?avr5=mmcu?at90usb647 \ |
| 215 | ++ mmcu?avr5=mmcu?at90usb1286 mmcu?avr5=mmcu?at90usb1287 \ |
| 216 | + mmcu?avr5=mmcu?at94k |
| 217 | + |
| 218 | + MULTILIB_EXCEPTIONS = |
0 commit comments