Patchwork [avr] Tidy up avr_extra_arch_macro

login
register
mail settings
Submitter Georg-Johann Lay
Date Oct. 17, 2012, 12:30 p.m.
Message ID <507EA4F1.8080303@gjlay.de>
Download mbox | patch
Permalink /patch/192030/
State New
Headers show

Comments

Georg-Johann Lay - Oct. 17, 2012, 12:30 p.m.
avr_extra_arch_macro is not really needed, it just holds avr_current_device->macro.

Thus, this tiny tidy up.

Ok for trunk?

Johann


	* 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.
Denis Chertykov - Oct. 17, 2012, 12:45 p.m.
2012/10/17 Georg-Johann Lay <avr@gjlay.de>:
> avr_extra_arch_macro is not really needed, it just holds avr_current_device->macro.
>
> Thus, this tiny tidy up.
>
> Ok for trunk?
>
> Johann
>
>
>         * 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.

Approved. Please apply.

Denis.

Patch

Index: config/avr/avr-c.c
===================================================================
--- config/avr/avr-c.c	(revision 192459)
+++ config/avr/avr-c.c	(working copy)
@@ -88,8 +88,8 @@  avr_cpu_cpp_builtins (struct cpp_reader
 
   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__");
Index: config/avr/avr-arch.h
===================================================================
--- config/avr/avr-arch.h	(revision 192459)
+++ config/avr/avr-arch.h	(working copy)
@@ -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[];
Index: config/avr/avr.c
===================================================================
--- config/avr/avr.c	(revision 192459)
+++ config/avr/avr.c	(working copy)
@@ -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. */