From 5d9b8bb41120c5f1dee0980dd3de395d50517ce4 Mon Sep 17 00:00:00 2001 From: Anatoly Sokolov Date: Tue, 8 Apr 2008 11:00:50 +0400 Subject: [PATCH] avr.h (TARGET_CPU_CPP_BUILTINS): Define __AVR_HAVE_EIJMP_EICALL__ macro if... * config/avr/avr.h (TARGET_CPU_CPP_BUILTINS): Define __AVR_HAVE_EIJMP_EICALL__ macro if device have EIJMP and EICALL instructions. * config/avr/avr.c (avr_mcu_types): Set AVR31 architecture for atmega103 device. From-SVN: r134069 --- gcc/ChangeLog | 8 ++++++++ gcc/config/avr/avr.c | 2 +- gcc/config/avr/avr.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7867fa1a382..25652c07a7a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-04-08 Anatoly Sokolov + + * config/avr/avr.h (TARGET_CPU_CPP_BUILTINS): Define + __AVR_HAVE_EIJMP_EICALL__ macro if device have EIJMP and EICALL + instructions. + * config/avr/avr.c (avr_mcu_types): Set AVR31 architecture for + atmega103 device. + 2008-04-07 Jan Hubicka * function.h (rtl): Rename to x_rtl. diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index e8e90b77333..3101ae68d93 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -200,7 +200,7 @@ static const struct mcu_type_s avr_mcu_types[] = { { "at76c711", ARCH_AVR3, "__AVR_AT76C711__" }, /* Classic, == 128K. */ { "avr31", ARCH_AVR31, NULL }, - { "atmega103", ARCH_AVR3, "__AVR_ATmega103__" }, + { "atmega103", ARCH_AVR31, "__AVR_ATmega103__" }, /* Classic + MOVW + JMP/CALL. */ { "avr35", ARCH_AVR35, NULL }, { "at90usb82", ARCH_AVR35, "__AVR_AT90USB82__" }, diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index 373e9d6991e..7dbc76ce9de 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -82,7 +82,7 @@ extern const struct base_arch_s *avr_current_arch; builtin_define ("__AVR_HAVE_JMP_CALL__"); \ if (avr_current_arch->have_eijmp_eicall) \ { \ - builtin_define ("__AVR_HAVE_JMP_CALL__"); \ + builtin_define ("__AVR_HAVE_EIJMP_EICALL__"); \ builtin_define ("__AVR_3_BYTE_PC__"); \ } \ else \ -- 2.30.2