[oe-commits] Phil Blundell : eglibc: More armv4t interwork fixes and one typo in existing patch

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 5bf7719db1cf57d0a7cc027403f60c3e8fcbdc97
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5bf7719db1cf57d0a7cc027403f60c3e8fcbdc97

Author: Phil Blundell <philb at gnu.org>
Date:   Wed Nov  4 09:11:28 2009 +0100

eglibc: More armv4t interwork fixes and one typo in existing patch

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

---

 recipes/eglibc/eglibc_2.10.bb                      |    3 +-
 .../files/armv4t-glibc-non-interworking-safe.patch |   25 ++++++++++++++++++++
 recipes/eglibc/files/armv4t-interworking.patch     |    2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index d143b0a..72af8ce 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -3,12 +3,13 @@ require eglibc.inc
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
 PV = "2.10"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 SVN_REV="9124"
 EGLIBC_BRANCH="eglibc-2_10"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_10;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://armv4t-interworking.patch;patch=1 \
+           file://armv4t-glibc-non-interworking-safe.patch;patch=1 \
            file://IO-acquire-lock-fix.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
diff --git a/recipes/eglibc/files/armv4t-glibc-non-interworking-safe.patch b/recipes/eglibc/files/armv4t-glibc-non-interworking-safe.patch
new file mode 100644
index 0000000..982eb46
--- /dev/null
+++ b/recipes/eglibc/files/armv4t-glibc-non-interworking-safe.patch
@@ -0,0 +1,25 @@
+This is not interworking safe on armv4t (although it is on v5).
+Patch by Phill Blundell
+--- a/ports/sysdeps/unix/sysv/linux/arm/sysdep.h	2009-09-16 13:58:18.000000000 +0100
++++ b/ports/sysdeps/unix/sysv/linux/arm/sysdep.h	2009-11-03 19:17:16.000000000 +0000
+@@ -129,6 +129,11 @@
+        DO_RET(lr);						\
+ 1:     .word C_SYMBOL_NAME(rtld_errno) - 0b - 8;
+ # else
++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
++#define POP_PC  ldr     lr, [sp], #4; bx lr
++#else
++#define POP_PC  ldr     pc, [sp], #4
++#endif
+ #  define SYSCALL_ERROR_HANDLER					\
+ __local_syscall_error:						\
+ 	str	lr, [sp, #-4]!;					\
+@@ -138,7 +143,7 @@
+ 	rsb	r1, r1, #0;					\
+ 	str	r1, [r0];					\
+ 	mvn	r0, #0;						\
+-	ldr	pc, [sp], #4;
++	POP_PC;
+ # endif
+ #else
+ # define SYSCALL_ERROR_HANDLER	/* Nothing here; code in sysdep.S is used.  */
diff --git a/recipes/eglibc/files/armv4t-interworking.patch b/recipes/eglibc/files/armv4t-interworking.patch
index 55ee856..9cd0a89 100644
--- a/recipes/eglibc/files/armv4t-interworking.patch
+++ b/recipes/eglibc/files/armv4t-interworking.patch
@@ -40,7 +40,7 @@ Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S
  #endif
  	@ pick the function arg and call address off the stack and execute
  	ldr	r0, [sp, #4]
-+#if defined(__ARM_ARCH_V4T__) && defined(__THUMB_INTERWORK__)
++#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
 +	ldr 	ip, [sp], #8
 +	mov	lr, pc
 +        bx      ip