diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/avr/avr-arch.h | 1 | ||||
| -rw-r--r-- | gcc/config/avr/avr-c.c | 4 | ||||
| -rw-r--r-- | gcc/config/avr/avr.c | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0787f59..84a1667 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-10-17 Georg-Johann Lay <avr@gjlay.de> + + * config/avr/avr-arch.h (avr_extra_arch_macro): Remove prototype. + * config/avr/avr.c (avr_extra_arch_macro): Remove variable. + (avr_option_override): Remove setting of avr_extra_arch_macro. + * config/avr/avr-c.c (avr_extra_arch_macro): Replace with + avr_current_device->macro. + 2012-10-17 Richard Biener <rguenther@suse.de> * tree-streamer-out.c (write_ts_decl_common_tree_pointers): diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h index b28bec9..a2a1a51 100644 --- a/gcc/config/avr/avr-arch.h +++ b/gcc/config/avr/avr-arch.h @@ -149,7 +149,6 @@ struct arch_info_s /* Preprocessor macros to define depending on MCU type. */ -extern const char *avr_extra_arch_macro; extern const struct base_arch_s *avr_current_arch; extern const struct mcu_type_s *avr_current_device; extern const struct mcu_type_s avr_mcu_types[]; diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c index 6eb0eba..6e7f8c7 100644 --- a/gcc/config/avr/avr-c.c +++ b/gcc/config/avr/avr-c.c @@ -88,8 +88,8 @@ avr_cpu_cpp_builtins (struct cpp_reader *pfile) if (avr_current_arch->macro) cpp_define_formatted (pfile, "__AVR_ARCH__=%s", avr_current_arch->macro); - if (avr_extra_arch_macro) - cpp_define (pfile, avr_extra_arch_macro); + if (avr_current_device->macro) + cpp_define (pfile, avr_current_device->macro); if (AVR_HAVE_RAMPD) cpp_define (pfile, "__AVR_HAVE_RAMPD__"); if (AVR_HAVE_RAMPX) cpp_define (pfile, "__AVR_HAVE_RAMPX__"); if (AVR_HAVE_RAMPY) cpp_define (pfile, "__AVR_HAVE_RAMPY__"); diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 1c5bab2..9ae5266 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -195,9 +195,6 @@ rtx rampz_rtx; static GTY(()) rtx xstring_empty; static GTY(()) rtx xstring_e; -/* Preprocessor macros to define depending on MCU type. */ -const char *avr_extra_arch_macro; - /* Current architecture. */ const struct base_arch_s *avr_current_arch; @@ -310,7 +307,6 @@ avr_option_override (void) avr_current_device = &avr_mcu_types[avr_mcu_index]; avr_current_arch = &avr_arch_types[avr_current_device->arch]; - avr_extra_arch_macro = avr_current_device->macro; /* RAM addresses of some SFRs common to all Devices in respective Arch. */ |