From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 24 Aug 2007 02:58:08 +0000 (+0000)
Subject: [BZ #3924]
X-Git-Tag: cvs/fedora-glibc-20070825T1839~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73e3ff07a3354d6c095e2945560755c8bc0a4387;p=thirdparty%2Fglibc.git

[BZ #3924]

	* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Correctly
	align for function call in case pltexit has to be called later.
---

diff --git a/ChangeLog b/ChangeLog
index 58df8983d01..3a00dd58235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-23  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #3924]
+	* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Correctly
+	align for function call in case pltexit has to be called later.
+
 	* sysdeps/i386/dl-trampoline.S (_dl_runtime_resolve): Avoid
 	implicit atomic operation when storing function pointer.
 	(_dl_runtime_profile): Likewise.
diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S
index 5856a2f8a08..af9eaf6d563 100644
--- a/sysdeps/i386/dl-trampoline.S
+++ b/sysdeps/i386/dl-trampoline.S
@@ -111,9 +111,10 @@ _dl_runtime_profile:
 	cfi_rel_offset (esi, 0)
 	leal 44(%esp), %esi
 	movl %ebx, %ecx
+	orl $4, %ebx		# Increase frame size if necessary to align
+				# stack for the function call
 	movl %esp, %edi
 	subl %ebx, %edi
-	andl $0xfffffff0, %edi	# Align stack
 	movl %esp, %ebx
 	cfi_def_cfa_register (ebx)
 	movl %edi, %esp