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: r56131

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a1311f24739b60f8ccc01c2f979817652b396b8..f79f8b132d3935b04bc6d8636bdbadb05ac4c07d 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  Adam Nemet  <anemet@lnxw.com>
 
        * config/arm/arm.c (thumb_unexpanded_epilogue): Stack the PIC

diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index 3725c7fe9da304533fa74b346693edb2f92178a8..42563d30378cb8b43d5bdd4723b564835b97e3ee 100644 (file)
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -151,7 +151,6 @@ extern void setup_incoming_varargs PARAMS ((CUMULATIVE_ARGS *,
                                            int *, int));
 extern struct rtx_def *rs6000_va_arg PARAMS ((tree, tree));
 extern void output_mi_thunk PARAMS ((FILE *, tree, int, tree));
-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 46b9161e5c4689acc0f0ef89458f43f2fa092ea7..ad99417d978a2a972c7c70ad5d57f01645f1e436 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -13115,24 +13115,3 @@ rs6000_xcoff_encode_section_info (decl, first)
       && ! DECL_WEAK (decl))
     SYMBOL_REF_FLAG (XEXP (DECL_RTL (decl), 0)) = 1;
 }
-
-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 77ed571ea0ce4824137799fbe9c261b55249f738..dadcc21c7b28c43db577bf57260d9053e2cca50a 100644 (file)
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -633,7 +633,12 @@ extern int rs6000_default_long_calls;
 
 /* 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.  */