[commits] r15113 - in /fsf/trunk/libc: ChangeLog sysdeps/i386/dl-trampoline.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug 30 00:02:20 2011
New Revision: 15113

Log:
Import glibc-mainline for 2011-08-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/i386/dl-trampoline.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 30 00:02:20 2011
@@ -1,3 +1,8 @@
+2011-08-29  Jiri Olsa <jolsa@xxxxxxxxxx>
+
+	* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi
+	directive.
+
 2011-08-24  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* sysdeps/sparc/sparc64/strcmp.S: Rewrite.

Modified: fsf/trunk/libc/sysdeps/i386/dl-trampoline.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/dl-trampoline.S (original)
+++ fsf/trunk/libc/sysdeps/i386/dl-trampoline.S Tue Aug 30 00:02:20 2011
@@ -1,5 +1,5 @@
 /* PLT trampolines.  i386 version.
-   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -99,7 +99,7 @@
 	    +4      %edx
 	   %esp     free
 	*/
-	cfi_adjust_cfa_offset (12)
+	cfi_adjust_cfa_offset (8)
 1:	movl %ebx, (%esp)
 	cfi_rel_offset (ebx, 0)
 	movl %edx, %ebx		# This is the frame buffer size