[commits] r7379 - in /branches/eglibc-2_9/ports: ./ sysdeps/unix/sysv/linux/arm/eabi/nptl/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Nov 20 09:20:57 2008
New Revision: 7379

Log:
	* sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
	(_Unwind_Resume): Adjust offset from PC for Thumb-2.
	* sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
	(_Unwind_Resume): Likewise.

Modified:
    branches/eglibc-2_9/ports/ChangeLog.eglibc
    branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
    branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c

Modified: branches/eglibc-2_9/ports/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_9/ports/ChangeLog.eglibc (original)
+++ branches/eglibc-2_9/ports/ChangeLog.eglibc Thu Nov 20 09:20:57 2008
@@ -1,3 +1,10 @@
+2008-11-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+	(_Unwind_Resume): Adjust offset from PC for Thumb-2.
+	* sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+	(_Unwind_Resume): Likewise.
+
 2008-08-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/bits/byteswap.h: Allow inclusion from <endian.h>.

Modified: branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
==============================================================================
--- branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c (original)
+++ branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c Thu Nov 20 09:20:57 2008
@@ -90,7 +90,11 @@
 "	ldr	r3, [r4, r5]\n"
 "	b	5b\n"
 "	.align 2\n"
+#ifdef __thumb2__
+"1:	.word	_GLOBAL_OFFSET_TABLE_ - 3b - 4\n"
+#else
 "1:	.word	_GLOBAL_OFFSET_TABLE_ - 3b - 8\n"
+#endif
 "2:	.word	libgcc_s_resume(GOTOFF)\n"
 "	.size	_Unwind_Resume, .-_Unwind_Resume\n"
 );

Modified: branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
==============================================================================
--- branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c (original)
+++ branches/eglibc-2_9/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c Thu Nov 20 09:20:57 2008
@@ -67,7 +67,11 @@
 "	ldr	r3, [r4, r5]\n"
 "	b	5b\n"
 "	.align 2\n"
+#ifdef __thumb2__
+"1:	.word	_GLOBAL_OFFSET_TABLE_ - 3b - 4\n"
+#else
 "1:	.word	_GLOBAL_OFFSET_TABLE_ - 3b - 8\n"
+#endif
 "2:	.word	libgcc_s_resume(GOTOFF)\n"
 "	.size	_Unwind_Resume, .-_Unwind_Resume\n"
 );