AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-13 00:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return to caller if dl_fixup fails to resolve callee on hppa.

Browse Source
This commit is contained in:
John David Anglin 2017-07-16 12:59:00 -04:00
parent ce1917d0bf
commit 1903b38c65
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2017-07-16 John David Anglin <danglin@gcc.gnu.org>
* sysdeps/hppa/dl-trampoline.S (_dl_runtime_resolve): Return to caller
if _dl_fixup fails.
* sysdeps/unix/sysv/linux/hppa/clone.S (__clone): Add .cfi annotation.
* sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Likewise.
* sysdeps/unix/sysv/linux/hppa/pt-vfork.S (__vfork): Likewise.

12
sysdeps/hppa/dl-trampoline.S
View File

@ -82,6 +82,11 @@ _dl_runtime_resolve:
bl _dl_fixup,%rp
copy %r21,%r19 /* set fixup func ltp */
/* Sometimes a final executable may attempt to call an undefined
weak function (e.g., __gmon_start__). Return if the function
was not resolved by _dl_fixup */
comib,= 0,%r28,1f
/* Load up the returned func descriptor */
copy %r28, %r22
copy %r29, %r19
@ -107,6 +112,13 @@ _dl_runtime_resolve:
/* Jump to new function, but return to previous function */
bv %r0(%r22)
ldw -20(%sp),%rp
1:
/* Return to previous function */
ldw -148(%sp),%rp
bv %r0(%rp)
ldo -128(%sp),%sp
.EXIT
.PROCEND
cfi_endproc