* config/xtensa/xtensa.h (TRAMPOLINE_TEMPLATE): Add a byte of padding.

	(TRAMPOLINE_SIZE): Round up to 60.
	* config/xtensa/lib2funcs.S (TRAMPOLINE_SIZE): Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 21e1a20..8096236 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-01  Bob Wilson  <bob.wilson@acm.org>
+
+       * config/xtensa/xtensa.h (TRAMPOLINE_TEMPLATE): Add a byte of padding.
+       (TRAMPOLINE_SIZE): Round up to 60.
+       * config/xtensa/lib2funcs.S (TRAMPOLINE_SIZE): Likewise.
+
 2005-10-31  James E. Wilson  <wilson@specifix.com>
 
        PR debug/24444
@@ -6405,7 +6411,7 @@
        * gcc.c (main): Compare language[0] with '*' when iterating over
        the infiles.
 
-2005-07-13  Adrian Strae½tling  <straetling@de.ibm.com>
+2005-07-13  Adrian Strae½tling  <straetling@de.ibm.com>
 
        * config/s390/s390.c: (s390_cc_modes_compatible): Move before
        "s390_emit_compare".  Add handling of CCZ1mode.
@@ -6418,7 +6424,7 @@
        Use CCZ1mode instead of CCZmode.
        * config/s390/s390-modes.def: Add CCZ1mode.  Comment new mode.
 
-2006-07-13  Adrian Strae½tling  <straetling@de.ibm.com>
+2006-07-13  Adrian Strae½tling  <straetling@de.ibm.com>
 
        * config/s390/s390.md: ("cmpstrsi", "*cmpstr<mode>"): New
        pattern.

diff --git a/gcc/config/xtensa/lib2funcs.S b/gcc/config/xtensa/lib2funcs.S
index 943b595..c858456 100644 (file)
--- a/gcc/config/xtensa/lib2funcs.S
+++ b/gcc/config/xtensa/lib2funcs.S
@@ -151,7 +151,7 @@ __xtensa_nonlocal_goto:
    make sure that the modified instructions are loaded into the instruction
    fetch buffer.  */
 
-#define TRAMPOLINE_SIZE 59
+#define TRAMPOLINE_SIZE 60
 
        .text
        .align  4

diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
index 3329ec6..3fc8abd 100644 (file)
--- a/gcc/config/xtensa/xtensa.h
+++ b/gcc/config/xtensa/xtensa.h
@@ -831,11 +831,13 @@ typedef struct xtensa_args
     /* jump to the instruction following the entry */                  \
     fprintf (STREAM, "\taddi\ta8, a8, 3\n");                           \
     fprintf (STREAM, "\tjx\ta8\n");                                    \
+    fprintf (STREAM, "\t.byte\t0\n");                                  \
     fprintf (STREAM, "\t.end no-transform\n");                         \
   } while (0)
 
-/* Size in bytes of the trampoline, as an integer.  */
-#define TRAMPOLINE_SIZE 59
+/* Size in bytes of the trampoline, as an integer.  Make sure this is
+   a multiple of TRAMPOLINE_ALIGNMENT to avoid -Wpadded warnings.  */
+#define TRAMPOLINE_SIZE 60
 
 /* Alignment required for trampolines, in bits.  */
 #define TRAMPOLINE_ALIGNMENT (32)