arm.c (ROUND_UP_WORD): Renamed from ROUND_UP.

	* arm.c (ROUND_UP_WORD): Renamed from ROUND_UP.
	* arm.h (ROUND_UP_WORD): Likewise.

From-SVN: r61390

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c31014becfc8d89af9280a4ba3959d81bb0d9ad2..5540759b5da8b1e58702afa1f440f031e4516379 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+       * arm.c (ROUND_UP_WORD): Renamed from ROUND_UP.
+       * arm.h (ROUND_UP_WORD): Likewise.
+
        * arm.h (CONDITIONAL_REGISTER_USAGE): Avoid signed/unsigned
        warning.
        * emit-rtl.c (gen_rtx_REG, set_mem_attributes_minus_bitpos,

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 04cdec7fe1eaf8b563f7eb85d27e7581bb044052..9f65028b73bbac974879ee1e7276933ee1578844 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -7513,7 +7513,7 @@ arm_poke_function_name (stream, name)
   rtx           x;
 
   length      = strlen (name) + 1;
-  alignlength = ROUND_UP (length);
+  alignlength = ROUND_UP_WORD (length);
   
   ASM_OUTPUT_ASCII (stream, name, length);
   ASM_OUTPUT_ALIGN (stream, 2);
@@ -8260,7 +8260,7 @@ arm_get_frame_size ()
 {
   int regno;
 
-  int base_size = ROUND_UP (get_frame_size ());
+  int base_size = ROUND_UP_WORD (get_frame_size ());
   int entry_size = 0;
   unsigned long func_type = arm_current_func_type ();
   int leaf;
@@ -10314,7 +10314,7 @@ thumb_get_frame_size ()
 {
   int regno;
 
-  int base_size = ROUND_UP (get_frame_size ());
+  int base_size = ROUND_UP_WORD (get_frame_size ());
   int count_regs = 0;
   int entry_size = 0;
   int leaf;
@@ -10421,7 +10421,7 @@ thumb_expand_prologue ()
 
   if (amount)
     {
-      amount = ROUND_UP (amount);
+      amount = ROUND_UP_WORD (amount);
       
       if (amount < 512)
        emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
@@ -10506,7 +10506,7 @@ thumb_expand_epilogue ()
     emit_insn (gen_movsi (stack_pointer_rtx, hard_frame_pointer_rtx));
   else if (amount)
     {
-      amount = ROUND_UP (amount);
+      amount = ROUND_UP_WORD (amount);
       
       if (amount < 512)
        emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 7349449ff35e30a031b578d54b05dd6b4307bdd8..48292a4c77afa2f2d2c44f7016ae862e732c8a2e 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -851,7 +851,7 @@ extern const char * structure_size_string;
     break;
 
 /* Round X up to the nearest word.  */
-#define ROUND_UP(X) (((X) + 3) & ~3)
+#define ROUND_UP_WORD(X) (((X) + 3) & ~3)
 
 /* Convert fron bytes to ints.  */
 #define ARM_NUM_INTS(X) (((X) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
@@ -1321,7 +1321,7 @@ enum reg_class
    this says how many the stack pointer really advances by.  */
 /* The push insns do not do this rounding implicitly.
    So don't define this. */
-/* #define PUSH_ROUNDING(NPUSHED)  ROUND_UP (NPUSHED) */
+/* #define PUSH_ROUNDING(NPUSHED)  ROUND_UP_WORD (NPUSHED) */
 
 /* Define this if the maximum size of all the outgoing args is to be
    accumulated and pushed during the prologue.  The amount can be