* function.c (TRAMPOLINE_ALIGNMENT): Always defined.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56078 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e035658..f833f2a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-06  Neil Booth  <neil@daikokuya.co.uk>
 
+       * function.c (TRAMPOLINE_ALIGNMENT): Always defined.
+
+2002-08-06  Neil Booth  <neil@daikokuya.co.uk>
+
        * cppinit.c (struct lang_flags): Rename trigraphs std.
        (set_lang): Update.
        * cpplib.h (struct cpp_options): New member std.

diff --git a/gcc/function.c b/gcc/function.c
index 47fa24d..5d53001 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5697,12 +5697,8 @@ trampoline_address (function)
 #else
   /* If rounding needed, allocate extra space
      to ensure we have TRAMPOLINE_SIZE bytes left after rounding up.  */
-#ifdef TRAMPOLINE_ALIGNMENT
 #define TRAMPOLINE_REAL_SIZE \
   (TRAMPOLINE_SIZE + (TRAMPOLINE_ALIGNMENT / BITS_PER_UNIT) - 1)
-#else
-#define TRAMPOLINE_REAL_SIZE (TRAMPOLINE_SIZE)
-#endif
   tramp = assign_stack_local_1 (BLKmode, TRAMPOLINE_REAL_SIZE, 0,
                                fp ? fp : cfun);
 #endif
@@ -5737,7 +5733,6 @@ static rtx
 round_trampoline_addr (tramp)
      rtx tramp;
 {
-#ifdef TRAMPOLINE_ALIGNMENT
   /* Round address up to desired boundary.  */
   rtx temp = gen_reg_rtx (Pmode);
   rtx addend = GEN_INT (TRAMPOLINE_ALIGNMENT / BITS_PER_UNIT - 1);
@@ -5747,7 +5742,7 @@ round_trampoline_addr (tramp)
                               temp, 0, OPTAB_LIB_WIDEN);
   tramp = expand_simple_binop (Pmode, AND, temp, mask,
                               temp, 0, OPTAB_LIB_WIDEN);
-#endif
+
   return tramp;
 }