[commits] r14666 - in /branches/eglibc-2_11/ports: ChangeLog.arm sysdeps/arm/elf/start.S

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Jul 22 07:00:32 2011
New Revision: 14666

Log:
Merge changes between r14015 and r14665 from /fsf/glibc-2_11-branch.

Modified:
    branches/eglibc-2_11/ports/ChangeLog.arm
    branches/eglibc-2_11/ports/sysdeps/arm/elf/start.S

Modified: branches/eglibc-2_11/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_11/ports/ChangeLog.arm Fri Jul 22 07:00:32 2011
@@ -1,3 +1,7 @@
+2011-06-30  Richard Sandiford  <richard.sandiford@xxxxxxxxxx>
+
+	* sysdeps/arm/elf/start.S (_start): Align the constant pool to 4 bytes.
+
 2011-02-16  Manjunath Matti  <manjunath81@xxxxxxxxx>
 
 	* sysdeps/arm/sysdep.h (CALL_MCOUNT): Use __gnu_mcount_nc

Modified: branches/eglibc-2_11/ports/sysdeps/arm/elf/start.S
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/arm/elf/start.S (original)
+++ branches/eglibc-2_11/ports/sysdeps/arm/elf/start.S Fri Jul 22 07:00:32 2011
@@ -134,6 +134,7 @@
 	bl abort
 
 #ifdef SHARED
+	.align 2
 .L_GOT:
 	.word _GLOBAL_OFFSET_TABLE_ - .L_GOT
 	.word __libc_csu_fini(GOT)