From: villemoes Date: Wed, 12 Dec 2018 10:12:36 +0000 (+0000) Subject: libgcc: rs6000: tramp.S: fix placement of .cfi_endproc for __trampoline_setup X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3467ed6827b9031f7a7f0bb44d072806d3451e06;p=thirdparty%2Fgcc.git 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267051 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 39713edf01ca..24b7c9ac4a5a 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-12-12 Rasmus Villemoes + + * config/rs6000/tramp.S (__trampoline_setup): Also emit .size + and .cfi_endproc directives for VxWorks targets. + 2018-12-05 Paul Koning * udivmodhi4.c (__udivmodhi4): Fix loop end check. diff --git a/libgcc/config/rs6000/tramp.S b/libgcc/config/rs6000/tramp.S index 637f4510146a..a9f0f3826dcd 100644 --- 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