rs6000-protos.h (rs6000_field_alignment): Remove.

	* config/rs6000/rs6000-protos.h (rs6000_field_alignment): Remove.
	* config/rs6000/rs6000.c (rs6000_field_alignment): Move...
	* config/rs6000/rs6000.h (ADJUST_FIELD_ALIGN): ...inline into the
	macro.

From-SVN: r56130

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18634ed04db3c2a05a9e53780393f52eb9cf7fbe..3a20aa984ff0e898dc3d6641d2a66f7b3f1a087b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * config/rs6000/rs6000-protos.h (rs6000_field_alignment): Remove.
+       * config/rs6000/rs6000.c (rs6000_field_alignment): Move...
+       * config/rs6000/rs6000.h (ADJUST_FIELD_ALIGN): ...inline into the
+       macro.
+
 2002-08-08  Jakub Jelinek  <jakub@redhat.com>
 
        * stor-layout.c (place_union_field): For bitfields if

diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 83f7f21550f01d19f04da213130ea3b0f064eb6a..19aeb07b9e0c26ca65f3142b7e20980857f6e35e 100644 (file)
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -147,7 +147,6 @@ extern void output_mi_thunk PARAMS ((FILE *, tree, int, tree));
 extern void rs6000_encode_section_info PARAMS ((tree));
 extern void rs6000_select_section PARAMS ((tree, int));
 extern void rs6000_unique_section PARAMS ((tree, int));
-extern int rs6000_field_alignment PARAMS ((tree, int));
 #ifdef ARGS_SIZE_RTX
 /* expr.h defines ARGS_SIZE_RTX and `enum direction' */
 extern enum direction function_arg_padding PARAMS ((enum machine_mode, tree));

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0f6b1462eb9ba420b08f8ac373440c48a0814be3..7940315fc4bbe163d581d9b1df1efd9e2ca0254c 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -11534,24 +11534,3 @@ xcoff_asm_named_section (name, flags)
   fprintf (asm_out_file, "\t.csect %s\n", name);
 }
 #endif
-
-int
-rs6000_field_alignment (field, computed)
-     tree field;
-     int computed;
-{
-  tree type = get_inner_array_type (field);
-
-  if (DEFAULT_ABI == ABI_V4)
-    {
-      if (TARGET_ALTIVEC && TREE_CODE (type) == VECTOR_TYPE)
-       return 128;
-    }
-  else
-    {
-      if (TYPE_MODE (type) == DFmode)
-       return MIN (32, computed);
-    }
-
-  return computed;
-}

diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index ecdc1109ba9ab5c9e096cccab1e39dd473c4a749..be102897621774c71eced3677ab993b4208b163c 100644 (file)
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -640,7 +640,12 @@ extern int rs6000_altivec_abi;
 
 /* Most ABIs word-align FP doubles but doubleword-align 64-bit ints.  */
 #define ADJUST_FIELD_ALIGN(FIELD, COMPUTED) \
-  rs6000_field_alignment ((FIELD), (COMPUTED))
+  (DEFAULT_ABI == ABI_V4                                               \
+   ? ((TARGET_ALTIVEC                                                  \
+       && TREE_CODE (get_inner_array_type (FIELD)) == VECTOR_TYPE)     \
+      ? 128 : (COMPUTED))                                              \
+   : ((TYPE_MODE (get_inner_array_type (FIELD)) == DFmode)             \
+      ? MIN (32, (COMPUTED)) : (COMPUTED)))
 
 /* Make strings word-aligned so strcpy from constants will be faster.
    Make vector constants quadword aligned.  */