From: John David Anglin <danglin@gcc.gnu.org>
Date: Sun, 16 Jul 2017 16:59:00 +0000 (-0400)
Subject: Return to caller if dl_fixup fails to resolve callee on hppa.
X-Git-Tag: glibc-2.26~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1903b38c6599129d9c09d5cffc9ca7cbeb50b100;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 03e9ee0e686..4e3d106fefa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/sysdeps/hppa/dl-trampoline.S b/sysdeps/hppa/dl-trampoline.S
index 856339bffe1..f1294a931fa 100644
--- a/sysdeps/hppa/dl-trampoline.S
+++ b/sysdeps/hppa/dl-trampoline.S
@@ -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