Index: config/avr/gen-avr-mmcu-texi.c
===================================================================
--- config/avr/gen-avr-mmcu-texi.c	(revision 195150)
+++ config/avr/gen-avr-mmcu-texi.c	(working copy)
@@ -85,7 +85,7 @@ int main (void)
 {
   enum avr_arch arch = ARCH_UNKNOWN;
   size_t i, n_mcus = 0;
-  const struct mcu_type_s *mcu;
+  const avr_mcu_t *mcu;
 
   printf ("@c Copyright (C) 2012-2013 Free Software Foundation, Inc.\n");
   printf ("@c This is part of the GCC manual.\n");
Index: config/avr/avr-arch.h
===================================================================
--- config/avr/avr-arch.h	(revision 195151)
+++ config/avr/avr-arch.h	(working copy)
@@ -45,7 +45,7 @@ enum avr_arch
 
 /* Architecture-specific properties.  */
 
-struct base_arch_s
+typedef struct
 {
   /* Assembler only.  */
   int asm_only;
@@ -87,12 +87,12 @@ struct base_arch_s
 
   /* Architecture name.  */
   const char *const arch_name;
-};
+} avr_arch_t;
 
 
 /* Device-specific properties.  */
 
-struct mcu_type_s
+typedef struct
 {
   /* Device name.  */
   const char *const name;
@@ -134,22 +134,23 @@ struct mcu_type_s
 
   /* Name of device library.  */
   const char *const library_name;
-};
+} avr_mcu_t;
 
 /* Map architecture to its texinfo string.  */
 
-struct arch_info_s
+typedef struct
 {
   /* Architecture ID.  */
   enum avr_arch arch;
 
   /* textinfo source to describe the archtiecture.  */
   const char *texinfo;
-};
+} avr_arch_info_t;
 
 /* Preprocessor macros to define depending on MCU type.  */
 
-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[];
-extern const struct base_arch_s avr_arch_types[];
+extern const avr_arch_t avr_arch_types[];
+extern const avr_arch_t *avr_current_arch;
+
+extern const avr_mcu_t avr_mcu_types[];
+extern const avr_mcu_t *avr_current_device;
Index: config/avr/avr-devices.c
===================================================================
--- config/avr/avr-devices.c	(revision 195151)
+++ config/avr/avr-devices.c	(working copy)
@@ -27,7 +27,7 @@
 /* List of all known AVR MCU architectures.
    Order as of enum avr_arch from avr.h.  */
 
-const struct base_arch_s
+const avr_arch_t
 avr_arch_types[] =
 {
   /* unknown device specified */
@@ -56,7 +56,7 @@ avr_arch_types[] =
   { 0, 1, 1, 1, 1, 1, 1, 1, 1, 0x2000,  0, "107", "avrxmega7" }
 };
 
-const struct arch_info_s
+const avr_arch_info_t
 avr_texinfo[] =
 {
   { ARCH_AVR1,
@@ -101,9 +101,11 @@ avr_texinfo[] =
     "and more than 64@tie{}KiB of RAM." }
 };
 
-const struct mcu_type_s avr_mcu_types[] = {
-#define AVR_MCU(NAME,ARCH,MACRO,SHORT_SP,ERRATA_SKIP,DATA_SEC,N_FLASH,LIB_NAME)\
-  { NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH, LIB_NAME },
+const avr_mcu_t
+avr_mcu_types[] =
+{
+#define AVR_MCU(NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME)\
+  { NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME },
 #include "avr-mcus.def"
 #undef AVR_MCU
     /* End of list.  */
Index: config/avr/avr-mcus.def
===================================================================
--- config/avr/avr-mcus.def	(revision 195150)
+++ config/avr/avr-mcus.def	(working copy)
@@ -39,7 +39,7 @@
    AVR_MCU (NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH,
             LIBRARY_NAME)
 
-   where the arguments are the fields of struct mcu_type_s:
+   where the arguments are the fields of avr_mcu_t:
    
        NAME         Accept -mmcu=<NAME>
 
Index: config/avr/driver-avr.c
===================================================================
--- config/avr/driver-avr.c	(revision 195150)
+++ config/avr/driver-avr.c	(working copy)
@@ -24,10 +24,10 @@ along with GCC; see the file COPYING3.
 #include "tm.h"
 
 /* Current architecture.  */
-const struct base_arch_s *avr_current_arch = NULL;
+const avr_arch_t *avr_current_arch = NULL;
 
 /* Current device.  */
-const struct mcu_type_s *avr_current_device = NULL;
+const avr_mcu_t *avr_current_device = NULL;
 
 /* Initialize avr_current_arch and avr_current_device variables.  */
 
Index: config/avr/avr.c
===================================================================
--- config/avr/avr.c	(revision 195151)
+++ config/avr/avr.c	(working copy)
@@ -184,10 +184,10 @@ static GTY(()) rtx xstring_empty;
 static GTY(()) rtx xstring_e;
 
 /* Current architecture.  */
-const struct base_arch_s *avr_current_arch;
+const avr_arch_t *avr_current_arch;
 
 /* Current device.  */
-const struct mcu_type_s *avr_current_device;
+const avr_mcu_t *avr_current_device;
 
 /* Section to put switch tables in.  */
 static GTY(()) section *progmem_swtable_section;