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

+2008-04-08  Anatoly Sokolov <aesok@post.ru>
+
+	* 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  <jh@suse.cz>
 
 	* function.h (rtl): Rename to x_rtl.

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__" },

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					\