From: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Date: Sun, 19 Aug 2012 06:15:03 +0000 (+0000)
Subject: avr-log.c (avr_log_vadump): Properly use int-promoted enum values.
X-Git-Tag: misc/gccgo-go1_1_2~1304
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92f7f5fd57cef44f4d52fe15c87fb2fca52406f4;p=thirdparty%2Fgcc.git

avr-log.c (avr_log_vadump): Properly use int-promoted enum values.

        * config/avr/avr-log.c (avr_log_vadump): Properly use
        int-promoted enum values.
        * config/avr/avr.h (struct mcu_type_s): Change `arch' from
        int to enum avr_arch.
        * config/avr/gen-avr-mmcu-texi.c (main): Use correct initializer.

From-SVN: r190510
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dabed6c4684..29bad71761ff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-18  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+        * config/avr/avr-log.c (avr_log_vadump): Properly use
+        int-promoted enum values.
+        * config/avr/avr.h (struct mcu_type_s): Change `arch' from
+        int to enum avr_arch.
+        * config/avr/gen-avr-mmcu-texi.c (main): Use correct initializer.
+
 2012-08-18  Jan Hubicka  <jh@suse.cz>
 
 	PR lto/45375
diff --git a/gcc/config/avr/avr-log.c b/gcc/config/avr/avr-log.c
index f054bb59257d..f86165d4c8e2 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -284,15 +284,15 @@ avr_log_vadump (FILE *file, const char *fmt, va_list ap)
               break;
                         
             case 'm':
-              fputs (GET_MODE_NAME (va_arg (ap, enum machine_mode)), file);
+              fputs (GET_MODE_NAME ((enum machine_mode) va_arg (ap, int)), file);
               break;
               
             case 'C':
-              fputs (rtx_name[va_arg (ap, enum rtx_code)], file);
+              fputs (rtx_name[va_arg (ap, int)], file);
               break;
               
             case 'R':
-              fputs (reg_class_names[va_arg (ap, enum reg_class)], file);
+              fputs (reg_class_names[va_arg (ap, int)], file);
               break;
               
             case 'F':
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 48fd49544f8c..0ce0af4ca580 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -95,7 +95,7 @@ struct mcu_type_s {
   const char *const name;
   
   /* Index in avr_arch_types[].  */
-  int arch; 
+  enum avr_arch arch; 
   
   /* Must lie outside user's namespace.  NULL == no macro.  */
   const char *const macro;
diff --git a/gcc/config/avr/gen-avr-mmcu-texi.c b/gcc/config/avr/gen-avr-mmcu-texi.c
index b5cb3c4a8a4c..f4cb24e289f9 100644
--- a/gcc/config/avr/gen-avr-mmcu-texi.c
+++ b/gcc/config/avr/gen-avr-mmcu-texi.c
@@ -50,7 +50,7 @@ print_mcus (size_t n_mcus)
 
 int main (void)
 {
-  enum avr_arch arch = 0;
+  enum avr_arch arch = ARCH_UNKNOWN;
   size_t i, n_mcus = 0;
   const struct mcu_type_s *mcu;