uclibc: Upgrade recipes from 0.9.32 -> 0.9.33

Prefer 0.9.33 by default
Delete recipes for 0.9.32

Signed-off-by: Khem Raj <raj.khem@gmail.com>

33 files changed, 196 insertions, 1686 deletions

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 5bb253e9ce..b7c21605a8 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -20,7 +20,7 @@ GCCVERSION ?= "4.6%"
 SDKGCCVERSION ?= "4.6%"
 BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
-UCLIBCVERSION ?= "0.9.32"
+UCLIBCVERSION ?= "0.9.33"
 LINUXLIBCVERSION ?= "3.1"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
deleted file mode 100644
index da97d389a0..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 06cdcd2a9dd6b46b7fbb5b3ae0a62bdb7ee6c402 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 27 Jun 2011 17:48:18 -0700
-Subject: [PATCH] Config.in.arch: Free UCLIBC_HAS_FPU setting from depending on UCLIBC_HAS_FLOATS
-
-UCLIBC_HAS_FLOATS and UCLIBC_HAS_FPU are denoting two different aspects.
-UCLIBC_HAS_FLOATS covers the floating point operations which has nothing
-to do if you have FPU or not.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- extra/Configs/Config.in.arch |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
-index 5f7a2b0..c1ca390 100644
---- a/extra/Configs/Config.in.arch
-+++ b/extra/Configs/Config.in.arch
-@@ -133,7 +133,6 @@ config UCLIBC_HAS_FLOATS
- 
- config UCLIBC_HAS_FPU
- 	bool "Target CPU has a floating point unit (FPU)"
--	depends on UCLIBC_HAS_FLOATS
- 	default y
- 	help
- 	  If your target CPU does not have a Floating Point Unit (FPU) or a
--- 
-1.7.0.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
deleted file mode 100644
index 6892ceb922..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ecc7d34cbbaf83aae87b091555650ed33e27ed2e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 30 Jun 2011 00:32:11 -0700
-Subject: [PATCH] mips/signalfd.h: SFD_NONBLOCK for mips is 0200 unlike 04000 commonly
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/sys/signalfd.h |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/include/sys/signalfd.h b/include/sys/signalfd.h
-index 8cee17c..f1cb63a 100644
---- a/include/sys/signalfd.h
-+++ b/include/sys/signalfd.h
-@@ -64,6 +64,15 @@ enum
- # define SFD_NONBLOCK SFD_NONBLOCK
-   };
- 
-+#elif defined __mips__
-+enum
-+  {
-+    SFD_CLOEXEC = 02000000,
-+# define SFD_CLOEXEC SFD_CLOEXEC
-+    SFD_NONBLOCK = 0200
-+# define SFD_NONBLOCK SFD_NONBLOCK
-+  };
-+
- #else
- enum
-   {
--- 
-1.7.0.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
deleted file mode 100644
index 43d19fcf10..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Delivered-To: raj.khem@gmail.com

-Received: by 10.90.86.4 with SMTP id j4cs313307agb;

-        Sat, 8 Jan 2011 16:45:20 -0800 (PST)

-Received: by 10.227.141.78 with SMTP id l14mr16920947wbu.128.1294533919168;

-        Sat, 08 Jan 2011 16:45:19 -0800 (PST)

-Return-Path: <yann.morin.1998@anciens.enib.fr>

-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])

-        by mx.google.com with ESMTP id w30si33755908wbd.17.2011.01.08.16.45.18;

-        Sat, 08 Jan 2011 16:45:19 -0800 (PST)

-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;

-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr

-Received: from roazhon.bzh.lan ([90.32.245.227])

-	by mwinf5d24 with ME

-	id tClC1f0024v5z3u03ClHDo; Sun, 09 Jan 2011 01:45:18 +0100

-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-To: uclibc@uclibc.org

-Cc: Khem Raj <raj.khem@gmail.com>,

-	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,

-	Carmelo AMOROSO <carmelo.amoroso@st.com>

-Subject: [PATCH 6/7] ARM: detect BX availibility at build time

-Date: Sun,  9 Jan 2011 01:45:09 +0100

-Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr>

-X-Mailer: git-send-email 1.7.1

-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-

-The "use BX" option is now a suggestion that BX be used if available.

-Use a macro to detect if BX is available at build time. If so, and

-the user requested it be used, then use it. Otherwise, error out.

-

-Macro courtesy Khem RAJ:

-  http://lists.uclibc.org/pipermail/uclibc/2009-April/042301.html

-

-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-Cc: Khem Raj <raj.khem@gmail.com>

-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>

----

- extra/Configs/Config.arm              |    4 +++-

- libc/sysdeps/linux/arm/bits/arm_asm.h |    9 ++++++++-

- 2 files changed, 11 insertions(+), 2 deletions(-)

-

-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm

-index 227b90c..9aa9e56 100644

---- a/extra/Configs/Config.arm

-+++ b/extra/Configs/Config.arm

-@@ -33,4 +33,6 @@ config COMPILE_IN_THUMB_MODE

- config USE_BX

- 	bool "Use BX in function return"

- 	help

--	  Use BX instruction for THUMB aware architectures.

-+	  Say 'y' to use BX to return from functions on your thumb-aware

-+	  processor. Say 'y' if you need to use interworking. Say 'n' if not.

-+	  It is safe to say 'y' even if you're not doing interworking.

-diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h

-index 1d87df6..921c9a3 100644

---- a/libc/sysdeps/linux/arm/bits/arm_asm.h

-+++ b/libc/sysdeps/linux/arm/bits/arm_asm.h

-@@ -24,5 +24,12 @@

- #define THUMB1_ONLY 1

- #endif

- 

--#endif /* _ARM_ASM_H */

-+#if defined(__USE_BX__)

-+# if (   defined (__ARM_ARCH_2__)  || defined (__ARM_ARCH_3__) \

-+      || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \

-+     )

-+#  error Use of BX was requested, but is not available on the target processor.

-+# endif /* ARCH level */

-+#endif /* __USE_BX__ */

- 

-+#endif /* _ARM_ASM_H */

--- 

-1.7.1

-

diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
deleted file mode 100644
index bcd834d618..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix a compile error due to last argument to syscall() not being memory addressable.
-
-Upstream-Status: Pending
-Signed-off-by: Phil Blundell <philb@gnu.org>
-
-diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
-index 85b0cfd..c034b2c 100644
---- a/libc/sysdeps/linux/common/epoll.c
-+++ b/libc/sysdeps/linux/common/epoll.c
-@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
- int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
- 						int timeout, const sigset_t *set)
- {
-+	int nsig = _NSIG / 8;
- 	if (SINGLE_THREAD_P)
--		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- # ifdef __UCLIBC_HAS_THREADS_NATIVE__
- 	else {
- 		int oldtype = LIBC_CANCEL_ASYNC ();
--		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- 		LIBC_CANCEL_RESET (oldtype);
- 		return result;
- 	}
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
deleted file mode 100644
index 55c312e2ca..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Delivered-To: raj.khem@gmail.com

-Received: by 10.90.86.4 with SMTP id j4cs313304agb;

-        Sat, 8 Jan 2011 16:45:19 -0800 (PST)

-Received: by 10.227.155.75 with SMTP id r11mr17188266wbw.3.1294533918432;

-        Sat, 08 Jan 2011 16:45:18 -0800 (PST)

-Return-Path: <yann.morin.1998@anciens.enib.fr>

-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])

-        by mx.google.com with ESMTP id k3si33753340wbx.29.2011.01.08.16.45.17;

-        Sat, 08 Jan 2011 16:45:18 -0800 (PST)

-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;

-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr

-Received: from roazhon.bzh.lan ([90.32.245.227])

-	by mwinf5d24 with ME

-	id tClC1f0024v5z3u03ClHDf; Sun, 09 Jan 2011 01:45:17 +0100

-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-To: uclibc@uclibc.org

-Cc: Khem Raj <raj.khem@gmail.com>,

-	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,

-	Carmelo AMOROSO <carmelo.amoroso@st.com>

-Subject: [PATCH 5/7] ARM: #include <bits/arm_asm.h> where __USE_BX__ is used

-Date: Sun,  9 Jan 2011 01:45:08 +0100

-Message-Id: <1294533910-19305-6-git-send-email-yann.morin.1998@anciens.enib.fr>

-X-Mailer: git-send-email 1.7.1

-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-

-The check for __USE_BX__ will be available in bits/arm_asm.h,

-so the latter must be included wherever the former is used.

-

-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-Cc: Khem Raj <raj.khem@gmail.com>

-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>

----

- ldso/ldso/arm/dl-startup.h      |    1 +

- libc/sysdeps/linux/arm/sysdep.h |    1 +

- 2 files changed, 2 insertions(+), 0 deletions(-)

-

-diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h

-index a95389d..2dfdaff 100644

---- a/ldso/ldso/arm/dl-startup.h

-+++ b/ldso/ldso/arm/dl-startup.h

-@@ -7,6 +7,7 @@

-  */

- 

- #include <features.h>

-+#include <bits/arm_asm.h>

- 

- #if !defined(__thumb__)

- __asm__(

-diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h

-index 013f88c..e498695 100644

---- a/libc/sysdeps/linux/arm/sysdep.h

-+++ b/libc/sysdeps/linux/arm/sysdep.h

-@@ -21,6 +21,7 @@

- #define _LINUX_ARM_SYSDEP_H 1

- 

- #include <common/sysdep.h>

-+#include <bits/arm_asm.h>

- 

- #include <sys/syscall.h>

- /* For Linux we can use the system call table in the header file

--- 

-1.7.1

-

diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
deleted file mode 100644
index 3508e0ee24..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Sync mount.h from glibc this is needed to get missing defines
-that some apps e.g. systemd are depending on
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/include/sys/mount.h
-===================================================================
---- git.orig/include/sys/mount.h	2011-07-21 14:37:27.134255747 -0700
-+++ git/include/sys/mount.h	2011-07-21 14:39:53.844470932 -0700
-@@ -1,5 +1,5 @@
- /* Header file for mounting/unmount Linux filesystems.
--   Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -47,23 +47,46 @@
- #define MS_REMOUNT	MS_REMOUNT
-   MS_MANDLOCK = 64,		/* Allow mandatory locks on an FS.  */
- #define MS_MANDLOCK	MS_MANDLOCK
--  S_WRITE = 128,		/* Write on file/directory/symlink.  */
--#define S_WRITE		S_WRITE
--  S_APPEND = 256,		/* Append-only file.  */
--#define S_APPEND	S_APPEND
--  S_IMMUTABLE = 512,		/* Immutable file.  */
--#define S_IMMUTABLE	S_IMMUTABLE
-+  MS_DIRSYNC = 128,		/* Directory modifications are synchronous.  */
-+#define MS_DIRSYNC	MS_DIRSYNC
-   MS_NOATIME = 1024,		/* Do not update access times.  */
- #define MS_NOATIME	MS_NOATIME
-   MS_NODIRATIME = 2048,		/* Do not update directory access times.  */
- #define MS_NODIRATIME	MS_NODIRATIME
-   MS_BIND = 4096,		/* Bind directory at different place.  */
- #define MS_BIND		MS_BIND
-+  MS_MOVE = 8192,
-+#define MS_MOVE		MS_MOVE
-+  MS_REC = 16384,
-+#define MS_REC		MS_REC
-+  MS_SILENT = 32768,
-+#define MS_SILENT	MS_SILENT
-+  MS_POSIXACL = 1 << 16,	/* VFS does not apply the umask.  */
-+#define MS_POSIXACL	MS_POSIXACL
-+  MS_UNBINDABLE = 1 << 17,	/* Change to unbindable.  */
-+#define MS_UNBINDABLE	MS_UNBINDABLE
-+  MS_PRIVATE = 1 << 18,		/* Change to private.  */
-+#define MS_PRIVATE	MS_PRIVATE
-+  MS_SLAVE = 1 << 19,		/* Change to slave.  */
-+#define MS_SLAVE	MS_SLAVE
-+  MS_SHARED = 1 << 20,		/* Change to shared.  */
-+#define MS_SHARED	MS_SHARED
-+  MS_RELATIME = 1 << 21,	/* Update atime relative to mtime/ctime.  */
-+#define MS_RELATIME	MS_RELATIME
-+  MS_KERNMOUNT = 1 << 22,	/* This is a kern_mount call.  */
-+#define MS_KERNMOUNT	MS_KERNMOUNT
-+  MS_I_VERSION =  1 << 23,	/* Update inode I_version field.  */
-+#define MS_I_VERSION	MS_I_VERSION
-+  MS_STRICTATIME = 1 << 24,	/* Always perform atime updates.  */
-+#define MS_STRICTATIME	MS_STRICTATIME
-+  MS_ACTIVE = 1 << 30,
-+#define MS_ACTIVE	MS_ACTIVE
-+  MS_NOUSER = 1 << 31
-+#define MS_NOUSER	MS_NOUSER
- };
- 
- /* Flags that can be altered by MS_REMOUNT  */
--#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
--		     |MS_NODIRATIME)
-+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
- 
- 
- /* Magic mount flag number. Has to be or-ed to the flag values.  */
-@@ -100,8 +123,10 @@
- #define MNT_FORCE MNT_FORCE
-   MNT_DETACH = 2,		/* Just detach from the tree.  */
- #define MNT_DETACH MNT_DETACH
--  MNT_EXPIRE = 4		/* Mark for expiry.  */
-+  MNT_EXPIRE = 4,		/* Mark for expiry.  */
- #define MNT_EXPIRE MNT_EXPIRE
-+  UMOUNT_NOFOLLOW = 8		/* Don't follow symlink on umount.  */
-+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
- };
- 
- 
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
deleted file mode 100644
index 8f3464e2e4..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Delivered-To: raj.khem@gmail.com

-Received: by 10.90.86.4 with SMTP id j4cs313309agb;

-        Sat, 8 Jan 2011 16:45:20 -0800 (PST)

-Received: by 10.216.173.7 with SMTP id u7mr612034wel.50.1294533919433;

-        Sat, 08 Jan 2011 16:45:19 -0800 (PST)

-Return-Path: <yann.morin.1998@anciens.enib.fr>

-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])

-        by mx.google.com with ESMTP id e10si33752027wer.68.2011.01.08.16.45.19;

-        Sat, 08 Jan 2011 16:45:19 -0800 (PST)

-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;

-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr

-Received: from roazhon.bzh.lan ([90.32.245.227])

-	by mwinf5d24 with ME

-	id tClC1f0024v5z3u03ClJDu; Sun, 09 Jan 2011 01:45:18 +0100

-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-To: uclibc@uclibc.org

-Cc: Khem Raj <raj.khem@gmail.com>,

-	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,

-	Carmelo AMOROSO <carmelo.amoroso@st.com>

-Subject: [PATCH 7/7] ARM: remove EABI/OABI selection

-Date: Sun,  9 Jan 2011 01:45:10 +0100

-Message-Id: <1294533910-19305-8-git-send-email-yann.morin.1998@anciens.enib.fr>

-X-Mailer: git-send-email 1.7.1

-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-

-Rely on the compiler to be properly setup for the default ABI.

-

-When installing-headers, there are two cases:

-- NPTL: no issue, a cross-compiler is already expected

-- LinuxThreads: no issue, EABI/OABI has no impact on installed headers.

-

-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-Cc: Khem Raj <raj.khem@gmail.com>

-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>

----

- extra/Configs/Config.arm               |   11 -----------

- libc/sysdeps/linux/arm/Makefile.arch   |    9 +++++++--

- libc/sysdeps/linux/arm/bits/huge_val.h |    4 ++--

- 3 files changed, 9 insertions(+), 15 deletions(-)

-

-Index: git/libc/sysdeps/linux/arm/Makefile.arch
-===================================================================
---- git.orig/libc/sysdeps/linux/arm/Makefile.arch
-+++ git/libc/sysdeps/linux/arm/Makefile.arch
-@@ -24,7 +24,12 @@ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)
- CSRC += posix_fadvise.c posix_fadvise64.c
- endif
- 
--ifeq ($(CONFIG_ARM_EABI),y)
-+# Is our compiler set up for EABI ?
-+IS_EABI:=$(shell $(CC) $(CFLAGS) -x c - -E -dM </dev/null 2>/dev/null \
-+                 |sed -r -e '/^\#[[:space:]]*define[[:space:]]+__ARM_EABI__([[:space:]]+1)?$$/!d; s/.+/y/;' \
-+          )
-+
-+ifeq ($(IS_EABI),y)
- CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \
- 	aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \
- 	aeabi_memmove.c aeabi_memset.c find_exidx.c
-@@ -37,7 +42,7 @@ else
- CSRC += syscall.c
- endif
- 
--ifeq ($(CONFIG_ARM_EABI),y)
-+ifeq ($(IS_EABI),y)
- libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \
- 	$(ARCH_OUT)/aeabi_sighandlers.o
- libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \
-Index: git/libc/sysdeps/linux/arm/bits/huge_val.h
-===================================================================
---- git.orig/libc/sysdeps/linux/arm/bits/huge_val.h
-+++ git/libc/sysdeps/linux/arm/bits/huge_val.h
-@@ -32,7 +32,7 @@
- # define HUGE_VAL (__extension__ 0x1.0p2047)
- #elif defined __GNUC__
- 
--#ifndef __CONFIG_ARM_EABI__
-+#ifndef __ARM_EABI__
- # define HUGE_VAL \
-   (__extension__							      \
-    ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
-@@ -50,7 +50,7 @@
- 
- typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
- 
--#ifndef __CONFIG_ARM_EABI__
-+#ifndef __ARM_EABI__
- # if __BYTE_ORDER == __BIG_ENDIAN
- #  define __HUGE_VAL_bytes	{ 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }
- # endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
deleted file mode 100644
index 920a66900d..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Delivered-To: raj.khem@gmail.com

-Received: by 10.90.86.4 with SMTP id j4cs313303agb;

-        Sat, 8 Jan 2011 16:45:18 -0800 (PST)

-Received: by 10.227.98.158 with SMTP id q30mr1255804wbn.151.1294533917314;

-        Sat, 08 Jan 2011 16:45:17 -0800 (PST)

-Return-Path: <yann.morin.1998@anciens.enib.fr>

-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])

-        by mx.google.com with ESMTP id r3si33749838wbr.54.2011.01.08.16.45.16;

-        Sat, 08 Jan 2011 16:45:17 -0800 (PST)

-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;

-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr

-Received: from roazhon.bzh.lan ([90.32.245.227])

-	by mwinf5d24 with ME

-	id tClC1f0024v5z3u03ClGDS; Sun, 09 Jan 2011 01:45:16 +0100

-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-To: uclibc@uclibc.org

-Cc: Khem Raj <raj.khem@gmail.com>,

-	Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,

-	Carmelo AMOROSO <carmelo.amoroso@st.com>

-Subject: [PATCH 3/7] ARM: remove sub-arch/variants selection from menuconfig

-Date: Sun,  9 Jan 2011 01:45:06 +0100

-Message-Id: <1294533910-19305-4-git-send-email-yann.morin.1998@anciens.enib.fr>

-X-Mailer: git-send-email 1.7.1

-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>

-

-Rely on the compiler to be correctly set up to generate

-appropriate code for the target variant.

-

-This exposes the Thumb option, as it is no longer auto-selected.

-The "Use BX" no longer depends on supported CPU to be selected,

-so it now defaults to 'n' as it shall work by default on CPUs

-that do not have BX.

-

-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

-Cc: Khem Raj <raj.khem@gmail.com>

-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>

----

- Rules.mak                |   19 -------

- extra/Configs/Config.arm |  125 ++--------------------------------------------

- 2 files changed, 5 insertions(+), 139 deletions(-)

-

-diff --git a/Rules.mak b/Rules.mak

-index 2a16908..09741a6 100644

---- a/Rules.mak

-+++ b/Rules.mak

-@@ -332,25 +332,6 @@ ifeq ($(TARGET_ARCH),arm)

- 	OPTIMIZATION+=-fstrict-aliasing

- 	CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian

- 	CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian

--	CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=

--	CPU_CFLAGS-$(CONFIG_ARM610)+=-mtune=arm610 -march=armv3

--	CPU_CFLAGS-$(CONFIG_ARM710)+=-mtune=arm710 -march=armv3

--	CPU_CFLAGS-$(CONFIG_ARM7TDMI)+=-mtune=arm7tdmi -march=armv4t

--	CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t

--	CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t

--	CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t

--	CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te

--	CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t

--	CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6

--	CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6

--	CPU_CFLAGS-$(CONFIG_ARM1176JZF_S)+=-mtune=arm1176jzf-s -march=armv6

--	CPU_CFLAGS-$(CONFIG_ARM_SA110)+=-mtune=strongarm110 -march=armv4

--	CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4

--	CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)

--	CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale

--	CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt

--	CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3

--	CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1

- 	CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb

- endif

- 

-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm

-index c9c40d4..6c75a00 100644

---- a/extra/Configs/Config.arm

-+++ b/extra/Configs/Config.arm

-@@ -30,129 +30,14 @@ config CONFIG_ARM_EABI

- 

- endchoice

- 

--choice

--	prompt "Target Processor Type"

--	default CONFIG_GENERIC_ARM

--	help

--	  This is the processor type of your CPU. This information is used for

--	  optimizing purposes.  To build a library that will run on all ARMCPU

--	  types (albeit not optimally fast), you can specify "Generic Arm" here.

--	  If you pick anything other than "Generic Arm", there is no guarantee 

--	  that uClibc will even run on anything other than the selected

--	  processor type.

--

--	  Here are the settings recommended for greatest speed:

--	  - "Generic Arm" select this if your compiler is already setup to

--	    optimize things properly, or if you want to run on pretty much

--	    everything, or you just don't much care.

--	  - For anything else, pick the ARM core type that best matches the

--	    cpu you will be using on your device.

--

--	  If you don't know what to do, choose "Generic Arm".

--

--config CONFIG_GENERIC_ARM

--	bool "Generic Arm"

--

--config CONFIG_ARM610

--	bool "Arm 610"

--	select ARCH_HAS_MMU

--

--config CONFIG_ARM710

--	bool "Arm 710"

--	select ARCH_HAS_MMU

--

--config CONFIG_ARM7TDMI

--	bool "Arm 7TDMI"

--	select ARCH_HAS_NO_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM720T

--	bool "Arm 720T"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM920T

--	bool "Arm 920T"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM922T

--	bool "Arm 922T"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM926T

--	bool "Arm 926T"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM10T

--	bool "Arm 10T"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM1136JF_S

--	bool "Arm 1136JF-S"

--	select ARCH_HAS_MMU

--	select HAS_THUMB

--

--config CONFIG_ARM1176JZ_S

--	bool "Arm 1176JZ-S"

--	select ARCH_HAS_MMU