AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[BZ 19170]
	* sysdeps/hppa/dl-trampoline.S (_dl_runtime_resolve): Return to caller
	if _dl_fixup fails.
This commit is contained in:
John David Anglin 2017-08-12 17:54:26 -04:00
parent 42f78808b1
commit 092788065e
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2017-08-12 John David Anglin <danglin@gcc.gnu.org>
[BZ 19170]
* sysdeps/hppa/dl-trampoline.S (_dl_runtime_resolve): Return to caller
if _dl_fixup fails.
2017-08-12 John David Anglin <danglin@gcc.gnu.org>
Adhemerval Zanella <adhemerval.zanella@linaro.org>

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

@ -82,6 +82,21 @@ _dl_runtime_resolve:
bl _dl_fixup,%rp
copy %r21,%r19 /* set fixup func ltp */
/* While the linker will set a function pointer to NULL when it
encounters an undefined weak function, we need to dynamically
detect removed weak functions. The issue arises because a weak
__gmon_start__ function was added to shared executables to work
around issues in _init that are now resolved. The presence of
__gmon_start__ in every shared library breaks the linker
`--as-needed' option. This __gmon_start__ function does nothing
but removal is tricky. Depending on the binding, removal can
cause an application using it to fault. The call to _dl_fixup
returns NULL when a function isn't resolved. In order to help
with __gmon_start__ removal, we return directly to the caller
when _dl_fixup returns NULL. This check could be removed when
BZ 19170 is fixed. */
comib,= 0,%r28,1f
/* Load up the returned func descriptor */
copy %r28, %r22
copy %r29, %r19
@ -107,6 +122,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