(TARGET_ALIGN_300): Renamed from TARGET_ALIGN_STRUCT_300.

(TARGET_SWITCHES): Rename -malign-struct-300 to -malign-300.
(BIGGEST_ALIGNMENT): Use TARGET_ALIGN_300.

From-SVN: r11159

diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index 9011f5f3198774c3596e0de19ec45383e24a64cd..a43b41bdf9976abb123ae67e9f1f921a0d4c8897 100644 (file)
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -80,12 +80,12 @@ extern int target_flags;
 #define TARGET_H8300   (! TARGET_H8300H)
 #define TARGET_H8300H  (target_flags & 4096)
 
-/* Align structures on the h8/300h the same way as the h8/300.  Specifically,
-   32 bit and larger values in structures are aligned on 16 bit boundaries.
+/* Align all values on the h8/300h the same way as the h8/300.  Specifically,
+   32 bit and larger values are aligned on 16 bit boundaries.
    This is all the hardware requires, but the default is 32 bits for the 300h.
    ??? Now watch someone add hardware floating point requiring 32 bit
    alignment.  */
-#define TARGET_ALIGN_STRUCT_300 (target_flags & 8192)
+#define TARGET_ALIGN_300 (target_flags & 8192)
 
 /* Macro to define tables used to set the flags.
    This is a list in braces of pairs in braces,
@@ -103,7 +103,7 @@ extern int target_flags;
     {"rtl-dump",2048},         \
     {"h",4096},                        \
     {"no-h",-4096},            \
-    {"align-struct-300",8192}, \
+    {"align-300",8192},        \
     { "", TARGET_DEFAULT}}
 
 /* Do things that must be done once at start up.  */
@@ -194,7 +194,8 @@ do {                                \
 
 /* No data type wants to be aligned rounder than this.
    32 bit values are aligned as such on the 300h for speed.  */
-#define BIGGEST_ALIGNMENT (TARGET_H8300H ? 32 : 16)
+#define BIGGEST_ALIGNMENT \
+((TARGET_H8300H && ! TARGET_ALIGN_STRUCT_300) ? 32 : 16)
 
 /* No structure field wants to be aligned rounder than this.  */
 #define BIGGEST_FIELD_ALIGNMENT \