- synchronized patches with official AVR toolchain 3.4.1.830

[packages/crossavr-gcc.git] / 413-gcc-atxmega64_128_b3.patch

diff --git a/413-gcc-atxmega64_128_b3.patch b/413-gcc-atxmega64_128_b3.patch
index 3f3bb548b43f47262ec8660f988621fe75b67b7a..63a414b4d4dc57f9b8b659c64b6e3ad10debe479 100644 (file)
--- a/413-gcc-atxmega64_128_b3.patch
+++ b/413-gcc-atxmega64_128_b3.patch
@@ -1,7 +1,7 @@
 diff -Naurp gcc/config/avr/avr-devices.c gcc/config/avr/avr-devices.c
 --- gcc/config/avr/avr-devices.c       2011-10-28 12:15:49.000000000 +0530
 +++ gcc/config/avr/avr-devices.c       2011-10-28 14:31:05.000000000 +0530
-@@ -275,6 +275,7 @@ const struct mcu_type_s avr_mcu_types[] 
+@@ -274,6 +274,7 @@ const struct mcu_type_s avr_mcu_types[] 
    { "avrxmega4",    ARCH_AVRXMEGA4, NULL,                           0, 0x2000, "x64d3" },
    { "atxmega64a3",  ARCH_AVRXMEGA4, "__AVR_ATxmega64A3__",          0, 0x2000, "x64a3" },
    { "atxmega64a3u", ARCH_AVRXMEGA4, "__AVR_ATxmega64A3U__",         0, 0x2000, "x64a3u"},
@@ -9,7 +9,7 @@ diff -Naurp gcc/config/avr/avr-devices.c gcc/config/avr/avr-devices.c
    { "atxmega64d3",  ARCH_AVRXMEGA4, "__AVR_ATxmega64D3__",          0, 0x2000, "x64d3" },
    { "atxmega64d4",  ARCH_AVRXMEGA4, "__AVR_ATxmega64D4__",          0, 0x2000, "x64d4" },
      /* Xmega, > 64K, <= 128K FLASH, > 64K RAM.  */
-@@ -286,6 +287,7 @@ const struct mcu_type_s avr_mcu_types[] 
+@@ -285,6 +286,7 @@ const struct mcu_type_s avr_mcu_types[] 
    { "atxmega128a3", ARCH_AVRXMEGA6, "__AVR_ATxmega128A3__",         0, 0x2000, "x128a3" },
    { "atxmega128a3u",ARCH_AVRXMEGA6, "__AVR_ATxmega128A3U__",        0, 0x2000, "x128a3u"},
    { "atxmega128b1", ARCH_AVRXMEGA6, "__AVR_ATxmega128B1__",         0, 0x2000, "x128b1" },
@@ -20,7 +20,7 @@ diff -Naurp gcc/config/avr/avr-devices.c gcc/config/avr/avr-devices.c
 diff -Naurp gcc/config/avr/t-avr gcc/config/avr/t-avr
 --- gcc/config/avr/t-avr       2011-10-28 12:15:49.000000000 +0530
 +++ gcc/config/avr/t-avr       2011-10-28 14:31:05.000000000 +0530
-@@ -285,6 +285,7 @@ MULTILIB_MATCHES = \
+@@ -284,6 +284,7 @@ MULTILIB_MATCHES = \
        mmcu?avrxmega2=mmcu?atxmega32x1 \
        mmcu?avrxmega4=mmcu?atxmega64a3 \
        mmcu?avrxmega4=mmcu?atxmega64a3u \
@@ -28,7 +28,7 @@ diff -Naurp gcc/config/avr/t-avr gcc/config/avr/t-avr
        mmcu?avrxmega4=mmcu?atxmega64d3 \
        mmcu?avrxmega4=mmcu?atxmega64d4 \
        mmcu?avrxmega5=mmcu?atxmega64a1 \
-@@ -292,6 +293,7 @@ MULTILIB_MATCHES = \
+@@ -291,6 +292,7 @@ MULTILIB_MATCHES = \
        mmcu?avrxmega6=mmcu?atxmega128a3 \
        mmcu?avrxmega6=mmcu?atxmega128a3u \
        mmcu?avrxmega6=mmcu?atxmega128b1 \