diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 294cab906..28e273d7d 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-19  Paul Brook  <paul@codesourcery.com>
+
+	* arm/crt0.S: Ensure doubleword stack alignment.
+
 2005-07-18  Richard Sandiford  <richard@codesourcery.com>
 
 	* mips/array.ld (.sdata): Include .gnu.linkonce.s.*, not
diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S
index 33bcc3a4b..bea289277 100644
--- a/libgloss/arm/crt0.S
+++ b/libgloss/arm/crt0.S
@@ -251,6 +251,11 @@ __change_mode:
 	add	r3, #4
 	b	.LC15
 .LC14:	
+	/* Ensure doubleword stack alignment.  */
+	mov	r4, sp
+	mov	r5, #7
+	bic	r4, r5
+	mov	sp, r4
 #else
 	add	r2, sp, r0, LSL #2	/* End of args */
 	mov	r3, sp			/* Start of args */
@@ -260,6 +265,8 @@ __change_mode:
 	strhi	r5, [r2, #-4]!
 	strhi	r4, [r3], #4
 	bhi	.LC13
+	/* Ensure doubleword stack alignment.  */
+	bic	sp, sp, #7
 #endif
 #endif