aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/avr/avr-log.c6
-rw-r--r--gcc/config/avr/avr.h2
-rw-r--r--gcc/config/avr/gen-avr-mmcu-texi.c2
4 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6dabed6..29bad71 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 f054bb5..f86165d 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 48fd495..0ce0af4 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 b5cb3c4..f4cb24e 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;