Skip to content

Commit

Permalink
libgcc: rs6000: tramp.S: fix placement of .cfi_endproc for __trampoli…
Browse files Browse the repository at this point in the history
…ne_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
  • Loading branch information
villemoes committed Dec 12, 2018
1 parent 74596c6 commit 3467ed6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 5 additions & 0 deletions libgcc/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 1 addition & 2 deletions libgcc/config/rs6000/tramp.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3467ed6

Please sign in to comment.