summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-17 08:43:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 14:28:09 +0100
commitd10df0e5a363fe8b305ffac7e8ac231da8e07552 (patch)
tree85c9811237ba60162187fe8d9670d90f169f88e1 /meta/recipes-core
parentb5cfa911ed80a7e57ae1025b9e365f4678acf491 (diff)
downloadopenembedded-core-d10df0e5a363fe8b305ffac7e8ac231da8e07552.tar.gz
openembedded-core-d10df0e5a363fe8b305ffac7e8ac231da8e07552.tar.bz2
openembedded-core-d10df0e5a363fe8b305ffac7e8ac231da8e07552.zip
gcc: remove unused patches and move patches in proper dir
gcc: update upstream-status for patches python: update upstream-status for patches libtool: update upstream-status of patches m4: update upstream status for patches eglibc: remove unused patches eglibc: update upstream status of patches glibc: update upstream-status of patches & remove unused patches Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch78
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/mips-rld-map-check.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/armv4t-interworking.patch82
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch2
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch2
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch8
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch5
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch2
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch4
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch2
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch16
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch14
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch2
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch2
-rw-r--r--meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff14
21 files changed, 41 insertions, 206 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
index 4d3e0613b1..46b1584fa6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
Index: libc/bits/stdio-lock.h
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
deleted file mode 100644
index 6ab306180c..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: libc/ports/sysdeps/arm/memcpy.S
-===================================================================
---- libc.orig/ports/sysdeps/arm/memcpy.S 2009-09-03 16:12:00.000000000 -0700
-+++ libc/ports/sysdeps/arm/memcpy.S 2009-10-28 12:51:22.000000000 -0700
-@@ -130,7 +130,12 @@ ENTRY(memcpy)
- strcsb r4, [r0], #1
- strcsb ip, [r0]
-
-+#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
-+ ldmfd sp!, {r0, r4, lr}
-+ bx lr
-+#else
- ldmfd sp!, {r0, r4, pc}
-+#endif
-
- 9: rsb ip, ip, #4
- cmp ip, #2
-Index: libc/ports/sysdeps/arm/memmove.S
-===================================================================
---- libc.orig/ports/sysdeps/arm/memmove.S 2009-09-03 16:12:00.000000000 -0700
-+++ libc/ports/sysdeps/arm/memmove.S 2009-10-28 12:51:22.000000000 -0700
-@@ -144,7 +144,12 @@ ENTRY(memmove)
- strneb r3, [r0, #-1]!
- strcsb r4, [r0, #-1]!
- strcsb ip, [r0, #-1]
-+#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
-+ ldmfd sp!, {r0, r4, lr}
-+ bx lr
-+#else
- ldmfd sp!, {r0, r4, pc}
-+#endif
-
- 9: cmp ip, #2
- ldrgtb r3, [r1, #-1]!
-Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S
-===================================================================
---- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-09-03 16:12:04.000000000 -0700
-+++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-10-28 12:51:22.000000000 -0700
-@@ -96,8 +96,14 @@ ENTRY(__clone)
- #endif
- @ pick the function arg and call address off the stack and execute
- ldr r0, [sp, #4]
-+#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
-+ ldr ip, [sp], #8
-+ mov lr, pc
-+ bx ip
-+#else
- mov lr, pc
- ldr pc, [sp], #8
-+#endif
-
- @ and we are done, passing the return value through r0
- b PLTJMP(HIDDEN_JUMPTARGET(_exit))
-Index: libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
-===================================================================
---- libc.orig/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-09-16 13:58:18.000000000 +0100
-+++ libc/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/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch
index 99c3fef802..1e7dfa7848 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff b/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
index 934d31ab89..89fff79c00 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
+++ b/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [Backport]
+
Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in
turn breaks behaviour of some Makefiles. Most notably eglibc's.
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
index f968678efb..40ae6d37f4 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
The default lib search path order is:
1) LD_LIBRARY_PATH
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.12/mips-rld-map-check.patch
index ed08d7e301..186c705e56 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/mips-rld-map-check.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/mips-rld-map-check.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
section if a --version-script sets _RLD_MAP to local. This is apparently
a binutils bug, but libc shouldn't segfault in this case.
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
index 57835adcdb..90e644ec3c 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html
This patch scratches an itch. Each individual gcc command in the
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/armv4t-interworking.patch b/meta/recipes-core/eglibc/eglibc-2.13/armv4t-interworking.patch
deleted file mode 100644
index 945a8ff687..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/armv4t-interworking.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Needed to support ARMv4t machines
-
-Upstream-status: Pending
-
-Index: libc/ports/sysdeps/arm/memcpy.S
-===================================================================
---- libc.orig/ports/sysdeps/arm/memcpy.S 2009-09-03 16:12:00.000000000 -0700
-+++ libc/ports/sysdeps/arm/memcpy.S 2009-10-28 12:51:22.000000000 -0700
-@@ -130,7 +130,12 @@ ENTRY(memcpy)
- strcsb r4, [r0], #1
- strcsb ip, [r0]
-
-+#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
-+ ldmfd sp!, {r0, r4, lr}
-+ bx lr
-+#else
- ldmfd sp!, {r0, r4, pc}
-+#endif
-
- 9: rsb ip, ip, #4
- cmp ip, #2
-Index: libc/ports/sysdeps/arm/memmove.S
-===================================================================
---- libc.orig/ports/sysdeps/arm/memmove.S 2009-09-03 16:12:00.000000000 -0700
-+++ libc/ports/sysdeps/arm/memmove.S 2009-10-28 12:51:22.000000000 -0700
-@@ -144,7 +144,12 @@ ENTRY(memmove)
- strneb r3, [r0, #-1]!
- strcsb r4, [r0, #-1]!
- strcsb ip, [r0, #-1]
-+#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
-+ ldmfd sp!, {r0, r4, lr}
-+ bx lr
-+#else
- ldmfd sp!, {r0, r4, pc}
-+#endif
-
- 9: cmp ip, #2
- ldrgtb r3, [r1, #-1]!
-Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S
-===================================================================
---- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-09-03 16:12:04.000000000 -0700
-+++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-10-28 12:51:22.000000000 -0700
-@@ -96,8 +96,14 @@ ENTRY(__clone)
- #endif
- @ pick the function arg and call address off the stack and execute
- ldr r0, [sp, #4]
-+#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
-+ ldr ip, [sp], #8
-+ mov lr, pc
-+ bx ip
-+#else
- mov lr, pc
- ldr pc, [sp], #8
-+#endif
-
- @ and we are done, passing the return value through r0
- b PLTJMP(HIDDEN_JUMPTARGET(_exit))
-Index: libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
-===================================================================
---- libc.orig/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-09-16 13:58:18.000000000 +0100
-+++ libc/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/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
index f968678efb..40ae6d37f4 100644
--- a/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
The default lib search path order is:
1) LD_LIBRARY_PATH
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
index 9424003a47..9740e17393 100644
--- a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
section if a --version-script sets _RLD_MAP to local. This is apparently
a binutils bug, but libc shouldn't segfault in this case.
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
index 7bd6d56feb..915325882b 100644
--- a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html
This patch scratches an itch. Each individual gcc command in the
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch
index 8069c8931d..cdfeaeadd8 100644
--- a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch
@@ -1,3 +1,11 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+We run the ldconfig in the cross fashion. make the code bitsize aware so that
+we can cross build ldconfig cache for various architectures.
+
+Richard Purdie <richard.purdie@linuxfoundation.org> 2009/05/19
+Nitin A Kamble <nitin.a.kamble@intel.com> 2009/03/29
+
Index: ldconfig-native-2.12.1/readelflib.c
===================================================================
--- ldconfig-native-2.12.1.orig/readelflib.c
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch
index 77ba03c1af..7f8e4db78a 100644
--- a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch
@@ -1,4 +1,7 @@
-Do data input/output handling according to endien-ness of the library file.
+Upstream-Status: Inappropriate [embedded specific]
+
+Do data input/output handling according to endien-ness of the library file. That
+enables use of ldconfig in the cross fashion for any architecture.
2011/04/04
Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch
index b148553055..4e9aab9416 100644
--- a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
The native version of ldconfig was using native definition of LD_SO (i.e.
ld-linux-x86-64.so.2 ) which is not correct for doing the cross ldconfig.
This was causing libc.so on the target marked as ELF lib rather than
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch
index 52ab64c0d6..52986e61c7 100644
--- a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+enable standalone building of ldconfig
+
---
cache.c | 11 +-
chroot_canon.c | 7 +
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
index 0312ca8833..27bc411078 100644
--- a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Coming from this bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11149
Nitin A Kamble <nitin.a.kamble@intel.com>2011/03/29
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
deleted file mode 100644
index b045405a37..0000000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
-===================================================================
---- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/check_pf.c 2009-06-19 20:45:32.451372131 +0400
-+++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c 2009-06-19 20:45:51.351313426 +0400
-@@ -207,9 +207,6 @@
- newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
- ? in6ai_deprecated : 0)
- | ((ifam->ifa_flags
-- & IFA_F_TEMPORARY)
-- ? in6ai_temporary : 0)
-- | ((ifam->ifa_flags
- & IFA_F_HOMEADDRESS)
- ? in6ai_homeaddress : 0));
- memcpy (newp->info.addr, address ?: local,
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
deleted file mode 100644
index 3f812959f5..0000000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
-===================================================================
---- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2009-06-19 20:54:35.446686910 +0400
-+++ glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2009-06-19 20:54:43.774683370 +0400
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>
-
- #define FUTEX_WAIT 0
- #define FUTEX_WAKE 1
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
index 4ac6d8b56f..07e4758601 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Inappropriate [not used]
+Upstream-Status: Inappropriate [configuration]
--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200
+++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
index a0e55bfaec..dec0892459 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
From libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org Tue Oct 31 17:37:21 2006
Return-Path: <libc-ports-return-550-listarch-libc-ports=sources dot redhat dot com at sourceware dot org>
Delivered-To: listarch-libc-ports at sources dot redhat dot com
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
deleted file mode 100644
index d6f3e0e3bc..0000000000
--- a/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
-+++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
-@@ -73,6 +73,9 @@
- # define DOCARGS_5 DOCARGS_4
- # define UNDOCARGS_5 UNDOCARGS_4
-
-+# define DOCARGS_6 DOCARGS_5
-+# define UNDOCARGS_6 UNDOCARGS_5
-+
- # ifdef IS_IN_libpthread
- # define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
- # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)