libgcc: rs6000: tramp.S: fix placement of .cfi_endproc for __trampoline_setup

Currently, .cfi_endproc and FUNC_END(__trampoline_setup) are placed
inside the #else branch of an "#if defined (__VXWORKS__) ...", so
non-pic vxworks does not get proper CFI nor a .size directive for
__trampoline_setup. I assume there's no magic reason for that (which
would warrant a comment), so move them outside.

From-SVN: r267051

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 39713edf01cae05557fd38437cb1295c71828861..24b7c9ac4a5ae004232ba7cc75cbc4b09b6d50ee 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-12  Rasmus Villemoes  <rv@rasmusvillemoes.dk>
+
+       * config/rs6000/tramp.S (__trampoline_setup): Also emit .size
+       and .cfi_endproc directives for VxWorks targets.
+
 2018-12-05  Paul Koning  <ni1d@arrl.net>
 
        * udivmodhi4.c (__udivmodhi4): Fix loop end check.

diff --git a/libgcc/config/rs6000/tramp.S b/libgcc/config/rs6000/tramp.S
index 637f4510146a19b86229aa7bbab23649d80b0e1b..a9f0f3826dcd09636c0b7d1dabde1a8a842616b6 100644 (file)
--- a/libgcc/config/rs6000/tramp.S
+++ b/libgcc/config/rs6000/tramp.S
@@ -114,11 +114,10 @@ FUNC_START(__trampoline_setup)
        addi    r30,r30,_GLOBAL_OFFSET_TABLE_-1b@l
 #endif
        bl      JUMP_TARGET(abort)
+#endif
        .cfi_endproc
 FUNC_END(__trampoline_setup)
 
-#endif
-
 #elif _CALL_ELF == 2
        .type   trampoline_initial,@object
        .align  3