[oe-commits] Martin Jansa : eglibc: sync eglibc_2.10.bb with version from oe.dev

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov  4 15:22:50 2009 +0100

eglibc: sync eglibc_2.10.bb with version from oe.dev

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

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

diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb
index 72af8ce..2a62fe3 100644
--- a/recipes/eglibc/eglibc_2.10.bb
+++ b/recipes/eglibc/eglibc_2.10.bb
@@ -9,7 +9,6 @@ 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
deleted file mode 100644
index 982eb46..0000000
--- a/recipes/eglibc/files/armv4t-glibc-non-interworking-safe.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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.  */