[commits] r8603 - in /trunk: libc/ libc/sysdeps/powerpc/powerpc32/power4/fpu/ libc/sysdeps/powerpc/powerpc32/power5/fpu/ ports/ ports/...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Jun 25 06:48:29 2009
New Revision: 8603

Log:
Merge changes between r8594 and r8602 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
    trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
    trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
    trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
    trunk/ports/ChangeLog.arm
    trunk/ports/sysdeps/arm/eabi/aeabi_lcsts.c

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Thu Jun 25 06:48:29 2009
@@ -1,3 +1,11 @@
+2009-06-24  Andreas Schwab  <aschwab@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S: Fix cfa offset
+	for saved registers.
+	* sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S: Likewise.
+	* sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S: Likewise.
+
 2009-06-23  Andreas Schwab  <aschwab@xxxxxxxxxx>
 
 	* time/tzfile.c (__tzfile_read): Don't use an empty TZ string.

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrt.S Thu Jun 25 06:48:29 2009
@@ -60,8 +60,8 @@
 	fmr	fp12,fp2
 	stw	r0,20(r1)
 	stw	r30,8(r1)
-	cfi_offset(lr,20)
-	cfi_offset(r30,8)
+	cfi_offset(lr,20-16)
+	cfi_offset(r30,8-16)
 #ifdef SHARED
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,.LCF1

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power4/fpu/w_sqrtf.S Thu Jun 25 06:48:29 2009
@@ -60,8 +60,8 @@
 	fmr	fp12,fp2
 	stw	r0,20(r1)
 	stw	r30,8(r1)
-	cfi_offset(lr,20)
-	cfi_offset(r30,8)
+	cfi_offset(lr,20-16)
+	cfi_offset(r30,8-16)
 #ifdef SHARED
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,.LCF1

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrt.S Thu Jun 25 06:48:29 2009
@@ -60,8 +60,8 @@
 	fmr	fp12,fp2
 	stw	r0,20(r1)
 	stw	r30,8(r1)
-	cfi_offset(lr,20)
-	cfi_offset(r30,8)
+	cfi_offset(lr,20-16)
+	cfi_offset(r30,8-16)
 #ifdef SHARED
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,.LCF1

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power5/fpu/w_sqrtf.S Thu Jun 25 06:48:29 2009
@@ -60,8 +60,8 @@
 	fmr	fp12,fp2
 	stw	r0,20(r1)
 	stw	r30,8(r1)
-	cfi_offset(lr,20)
-	cfi_offset(r30,8)
+	cfi_offset(lr,20-16)
+	cfi_offset(r30,8-16)
 #ifdef SHARED
 # ifdef HAVE_ASM_PPC_REL16
 	bcl	20,31,.LCF1

Modified: trunk/ports/ChangeLog.arm
==============================================================================
--- trunk/ports/ChangeLog.arm (original)
+++ trunk/ports/ChangeLog.arm Thu Jun 25 06:48:29 2009
@@ -1,3 +1,9 @@
+2009-06-25  Nathan Froyd  <froydnj@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/eabi/aeabi_lcsts.c (__aeabi_stdin, __aeabi_stdout,
+	__aeabi_stderr): New variables.
+	(setup_aeabi_stdio): New function.  Add it to .preinit_array.
+
 2009-06-24  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
             Mark Mitchell  <mark@xxxxxxxxxxxxxxxx>
             Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>

Modified: trunk/ports/sysdeps/arm/eabi/aeabi_lcsts.c
==============================================================================
--- trunk/ports/sysdeps/arm/eabi/aeabi_lcsts.c (original)
+++ trunk/ports/sysdeps/arm/eabi/aeabi_lcsts.c Thu Jun 25 06:48:29 2009
@@ -81,4 +81,19 @@
 eabi_constant (FILENAME_MAX);
 eabi_constant (L_tmpnam);
 
+FILE *__aeabi_stdin attribute_hidden;
+FILE *__aeabi_stdout attribute_hidden;
+FILE *__aeabi_stderr attribute_hidden;
+
+static void __attribute__ ((used))
+setup_aeabi_stdio (void)
+{
+  __aeabi_stdin = stdin;
+  __aeabi_stdout = stdout;
+  __aeabi_stderr = stderr;
+}
+
+static void (*fp) (void) __attribute__ ((used, section (".preinit_array")))
+  = setup_aeabi_stdio;
+
 eabi_constant (CLOCKS_PER_SEC);