[commits] r14300 - in /fsf/trunk/ports: ChangeLog.m68k sysdeps/m68k/dl-trampoline.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jun 23 00:04:13 2011
New Revision: 14300

Log:
Import glibc-ports-mainline for 2011-06-23

Modified:
    fsf/trunk/ports/ChangeLog.m68k
    fsf/trunk/ports/sysdeps/m68k/dl-trampoline.S

Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Thu Jun 23 00:04:13 2011
@@ -1,3 +1,8 @@
+2011-06-23  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/m68k/dl-trampoline.S (_dl_runtime_profile)
+	[__mcoldfire__]: Fix typo saving %fp0.
+
 2011-04-11  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/dl-tls.h (TLS_DTV_UNALLOCATED): Define.

Modified: fsf/trunk/ports/sysdeps/m68k/dl-trampoline.S
==============================================================================
--- fsf/trunk/ports/sysdeps/m68k/dl-trampoline.S (original)
+++ fsf/trunk/ports/sysdeps/m68k/dl-trampoline.S Thu Jun 23 00:04:13 2011
@@ -1,5 +1,5 @@
 /* PLT trampolines.  m68k version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
@@ -139,7 +139,7 @@
 	   %sp      %a0
 	*/
 #ifdef __mcoldfire__
-	fmove.l %fp0, -(%sp)
+	fmove.d %fp0, -(%sp)
 #else
 	fmove.x %fp0, -(%sp)
 #endif