summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 10:04:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 10:04:04 +0100
commitc9c14a198de1b44462184c03bc3f9be4848adfd8 (patch)
tree24a8a031b89da6af317bc8dd44c37a3e8ed3e0fe
parente803c58ffb05e6d1f5938f1bfe6dfca9e3c26e02 (diff)
downloadpoky-c9c14a198de1b44462184c03bc3f9be4848adfd8.tar.gz
Sync patches with DOS line endings that became corrupted
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch150
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch130
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch84
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch430
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch344
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch72
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/mkfs-xin-fixes.patch366
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch16
8 files changed, 796 insertions, 796 deletions
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
index c5d212a642..43d19fcf10 100644
--- 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
@@ -1,75 +1,75 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313307agb; 2Received: by 10.90.86.4 with SMTP id j4cs313307agb;
3 Sat, 8 Jan 2011 16:45:20 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:20 -0800 (PST)
4Received: by 10.227.141.78 with SMTP id l14mr16920947wbu.128.1294533919168; 4Received: by 10.227.141.78 with SMTP id l14mr16920947wbu.128.1294533919168;
5 Sat, 08 Jan 2011 16:45:19 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:19 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id w30si33755908wbd.17.2011.01.08.16.45.18; 8 by mx.google.com with ESMTP id w30si33755908wbd.17.2011.01.08.16.45.18;
9 Sat, 08 Jan 2011 16:45:19 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:19 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClHDo; Sun, 09 Jan 2011 01:45:18 +0100 14 id tClC1f0024v5z3u03ClHDo; Sun, 09 Jan 2011 01:45:18 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 6/7] ARM: detect BX availibility at build time 20Subject: [PATCH 6/7] ARM: detect BX availibility at build time
21Date: Sun, 9 Jan 2011 01:45:09 +0100 21Date: Sun, 9 Jan 2011 01:45:09 +0100
22Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27The "use BX" option is now a suggestion that BX be used if available. 27The "use BX" option is now a suggestion that BX be used if available.
28Use a macro to detect if BX is available at build time. If so, and 28Use a macro to detect if BX is available at build time. If so, and
29the user requested it be used, then use it. Otherwise, error out. 29the user requested it be used, then use it. Otherwise, error out.
30 30
31Macro courtesy Khem RAJ: 31Macro courtesy Khem RAJ:
32 http://lists.uclibc.org/pipermail/uclibc/2009-April/042301.html 32 http://lists.uclibc.org/pipermail/uclibc/2009-April/042301.html
33 33
34Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 34Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
35Cc: Khem Raj <raj.khem@gmail.com> 35Cc: Khem Raj <raj.khem@gmail.com>
36Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 36Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
37Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 37Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
38--- 38---
39 extra/Configs/Config.arm | 4 +++- 39 extra/Configs/Config.arm | 4 +++-
40 libc/sysdeps/linux/arm/bits/arm_asm.h | 9 ++++++++- 40 libc/sysdeps/linux/arm/bits/arm_asm.h | 9 ++++++++-
41 2 files changed, 11 insertions(+), 2 deletions(-) 41 2 files changed, 11 insertions(+), 2 deletions(-)
42 42
43diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm 43diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
44index 227b90c..9aa9e56 100644 44index 227b90c..9aa9e56 100644
45--- a/extra/Configs/Config.arm 45--- a/extra/Configs/Config.arm
46+++ b/extra/Configs/Config.arm 46+++ b/extra/Configs/Config.arm
47@@ -33,4 +33,6 @@ config COMPILE_IN_THUMB_MODE 47@@ -33,4 +33,6 @@ config COMPILE_IN_THUMB_MODE
48 config USE_BX 48 config USE_BX
49 bool "Use BX in function return" 49 bool "Use BX in function return"
50 help 50 help
51- Use BX instruction for THUMB aware architectures. 51- Use BX instruction for THUMB aware architectures.
52+ Say 'y' to use BX to return from functions on your thumb-aware 52+ Say 'y' to use BX to return from functions on your thumb-aware
53+ processor. Say 'y' if you need to use interworking. Say 'n' if not. 53+ processor. Say 'y' if you need to use interworking. Say 'n' if not.
54+ It is safe to say 'y' even if you're not doing interworking. 54+ It is safe to say 'y' even if you're not doing interworking.
55diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h 55diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h
56index 1d87df6..921c9a3 100644 56index 1d87df6..921c9a3 100644
57--- a/libc/sysdeps/linux/arm/bits/arm_asm.h 57--- a/libc/sysdeps/linux/arm/bits/arm_asm.h
58+++ b/libc/sysdeps/linux/arm/bits/arm_asm.h 58+++ b/libc/sysdeps/linux/arm/bits/arm_asm.h
59@@ -24,5 +24,12 @@ 59@@ -24,5 +24,12 @@
60 #define THUMB1_ONLY 1 60 #define THUMB1_ONLY 1
61 #endif 61 #endif
62 62
63-#endif /* _ARM_ASM_H */ 63-#endif /* _ARM_ASM_H */
64+#if defined(__USE_BX__) 64+#if defined(__USE_BX__)
65+# if ( defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ 65+# if ( defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
66+ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ 66+ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
67+ ) 67+ )
68+# error Use of BX was requested, but is not available on the target processor. 68+# error Use of BX was requested, but is not available on the target processor.
69+# endif /* ARCH level */ 69+# endif /* ARCH level */
70+#endif /* __USE_BX__ */ 70+#endif /* __USE_BX__ */
71 71
72+#endif /* _ARM_ASM_H */ 72+#endif /* _ARM_ASM_H */
73-- 73--
741.7.1 741.7.1
75 75
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
index 621896fb10..55c312e2ca 100644
--- 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
@@ -1,65 +1,65 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313304agb; 2Received: by 10.90.86.4 with SMTP id j4cs313304agb;
3 Sat, 8 Jan 2011 16:45:19 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:19 -0800 (PST)
4Received: by 10.227.155.75 with SMTP id r11mr17188266wbw.3.1294533918432; 4Received: by 10.227.155.75 with SMTP id r11mr17188266wbw.3.1294533918432;
5 Sat, 08 Jan 2011 16:45:18 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:18 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id k3si33753340wbx.29.2011.01.08.16.45.17; 8 by mx.google.com with ESMTP id k3si33753340wbx.29.2011.01.08.16.45.17;
9 Sat, 08 Jan 2011 16:45:18 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:18 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClHDf; Sun, 09 Jan 2011 01:45:17 +0100 14 id tClC1f0024v5z3u03ClHDf; Sun, 09 Jan 2011 01:45:17 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 5/7] ARM: #include <bits/arm_asm.h> where __USE_BX__ is used 20Subject: [PATCH 5/7] ARM: #include <bits/arm_asm.h> where __USE_BX__ is used
21Date: Sun, 9 Jan 2011 01:45:08 +0100 21Date: Sun, 9 Jan 2011 01:45:08 +0100
22Message-Id: <1294533910-19305-6-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-6-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27The check for __USE_BX__ will be available in bits/arm_asm.h, 27The check for __USE_BX__ will be available in bits/arm_asm.h,
28so the latter must be included wherever the former is used. 28so the latter must be included wherever the former is used.
29 29
30Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 30Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
31Cc: Khem Raj <raj.khem@gmail.com> 31Cc: Khem Raj <raj.khem@gmail.com>
32Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 32Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
33Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 33Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
34--- 34---
35 ldso/ldso/arm/dl-startup.h | 1 + 35 ldso/ldso/arm/dl-startup.h | 1 +
36 libc/sysdeps/linux/arm/sysdep.h | 1 + 36 libc/sysdeps/linux/arm/sysdep.h | 1 +
37 2 files changed, 2 insertions(+), 0 deletions(-) 37 2 files changed, 2 insertions(+), 0 deletions(-)
38 38
39diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h 39diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
40index a95389d..2dfdaff 100644 40index a95389d..2dfdaff 100644
41--- a/ldso/ldso/arm/dl-startup.h 41--- a/ldso/ldso/arm/dl-startup.h
42+++ b/ldso/ldso/arm/dl-startup.h 42+++ b/ldso/ldso/arm/dl-startup.h
43@@ -7,6 +7,7 @@ 43@@ -7,6 +7,7 @@
44 */ 44 */
45 45
46 #include <features.h> 46 #include <features.h>
47+#include <bits/arm_asm.h> 47+#include <bits/arm_asm.h>
48 48
49 #if !defined(__thumb__) 49 #if !defined(__thumb__)
50 __asm__( 50 __asm__(
51diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h 51diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h
52index 013f88c..e498695 100644 52index 013f88c..e498695 100644
53--- a/libc/sysdeps/linux/arm/sysdep.h 53--- a/libc/sysdeps/linux/arm/sysdep.h
54+++ b/libc/sysdeps/linux/arm/sysdep.h 54+++ b/libc/sysdeps/linux/arm/sysdep.h
55@@ -21,6 +21,7 @@ 55@@ -21,6 +21,7 @@
56 #define _LINUX_ARM_SYSDEP_H 1 56 #define _LINUX_ARM_SYSDEP_H 1
57 57
58 #include <common/sysdep.h> 58 #include <common/sysdep.h>
59+#include <bits/arm_asm.h> 59+#include <bits/arm_asm.h>
60 60
61 #include <sys/syscall.h> 61 #include <sys/syscall.h>
62 /* For Linux we can use the system call table in the header file 62 /* For Linux we can use the system call table in the header file
63-- 63--
641.7.1 641.7.1
65 65
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
index f4957351e9..8f3464e2e4 100644
--- 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
@@ -1,45 +1,45 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313309agb; 2Received: by 10.90.86.4 with SMTP id j4cs313309agb;
3 Sat, 8 Jan 2011 16:45:20 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:20 -0800 (PST)
4Received: by 10.216.173.7 with SMTP id u7mr612034wel.50.1294533919433; 4Received: by 10.216.173.7 with SMTP id u7mr612034wel.50.1294533919433;
5 Sat, 08 Jan 2011 16:45:19 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:19 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id e10si33752027wer.68.2011.01.08.16.45.19; 8 by mx.google.com with ESMTP id e10si33752027wer.68.2011.01.08.16.45.19;
9 Sat, 08 Jan 2011 16:45:19 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:19 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClJDu; Sun, 09 Jan 2011 01:45:18 +0100 14 id tClC1f0024v5z3u03ClJDu; Sun, 09 Jan 2011 01:45:18 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 7/7] ARM: remove EABI/OABI selection 20Subject: [PATCH 7/7] ARM: remove EABI/OABI selection
21Date: Sun, 9 Jan 2011 01:45:10 +0100 21Date: Sun, 9 Jan 2011 01:45:10 +0100
22Message-Id: <1294533910-19305-8-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-8-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27Rely on the compiler to be properly setup for the default ABI. 27Rely on the compiler to be properly setup for the default ABI.
28 28
29When installing-headers, there are two cases: 29When installing-headers, there are two cases:
30- NPTL: no issue, a cross-compiler is already expected 30- NPTL: no issue, a cross-compiler is already expected
31- LinuxThreads: no issue, EABI/OABI has no impact on installed headers. 31- LinuxThreads: no issue, EABI/OABI has no impact on installed headers.
32 32
33Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 33Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
34Cc: Khem Raj <raj.khem@gmail.com> 34Cc: Khem Raj <raj.khem@gmail.com>
35Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 35Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
36Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 36Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
37--- 37---
38 extra/Configs/Config.arm | 11 ----------- 38 extra/Configs/Config.arm | 11 -----------
39 libc/sysdeps/linux/arm/Makefile.arch | 9 +++++++-- 39 libc/sysdeps/linux/arm/Makefile.arch | 9 +++++++--
40 libc/sysdeps/linux/arm/bits/huge_val.h | 4 ++-- 40 libc/sysdeps/linux/arm/bits/huge_val.h | 4 ++--
41 3 files changed, 9 insertions(+), 15 deletions(-) 41 3 files changed, 9 insertions(+), 15 deletions(-)
42 42
43Index: git/libc/sysdeps/linux/arm/Makefile.arch 43Index: git/libc/sysdeps/linux/arm/Makefile.arch
44=================================================================== 44===================================================================
45--- git.orig/libc/sysdeps/linux/arm/Makefile.arch 45--- git.orig/libc/sysdeps/linux/arm/Makefile.arch
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
index 16f3f41c30..920a66900d 100644
--- 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
@@ -1,215 +1,215 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313303agb; 2Received: by 10.90.86.4 with SMTP id j4cs313303agb;
3 Sat, 8 Jan 2011 16:45:18 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:18 -0800 (PST)
4Received: by 10.227.98.158 with SMTP id q30mr1255804wbn.151.1294533917314; 4Received: by 10.227.98.158 with SMTP id q30mr1255804wbn.151.1294533917314;
5 Sat, 08 Jan 2011 16:45:17 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:17 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id r3si33749838wbr.54.2011.01.08.16.45.16; 8 by mx.google.com with ESMTP id r3si33749838wbr.54.2011.01.08.16.45.16;
9 Sat, 08 Jan 2011 16:45:17 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:17 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClGDS; Sun, 09 Jan 2011 01:45:16 +0100 14 id tClC1f0024v5z3u03ClGDS; Sun, 09 Jan 2011 01:45:16 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 3/7] ARM: remove sub-arch/variants selection from menuconfig 20Subject: [PATCH 3/7] ARM: remove sub-arch/variants selection from menuconfig
21Date: Sun, 9 Jan 2011 01:45:06 +0100 21Date: Sun, 9 Jan 2011 01:45:06 +0100
22Message-Id: <1294533910-19305-4-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-4-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27Rely on the compiler to be correctly set up to generate 27Rely on the compiler to be correctly set up to generate
28appropriate code for the target variant. 28appropriate code for the target variant.
29 29
30This exposes the Thumb option, as it is no longer auto-selected. 30This exposes the Thumb option, as it is no longer auto-selected.
31The "Use BX" no longer depends on supported CPU to be selected, 31The "Use BX" no longer depends on supported CPU to be selected,
32so it now defaults to 'n' as it shall work by default on CPUs 32so it now defaults to 'n' as it shall work by default on CPUs
33that do not have BX. 33that do not have BX.
34 34
35Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 35Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
36Cc: Khem Raj <raj.khem@gmail.com> 36Cc: Khem Raj <raj.khem@gmail.com>
37Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 37Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
38Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 38Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
39--- 39---
40 Rules.mak | 19 ------- 40 Rules.mak | 19 -------
41 extra/Configs/Config.arm | 125 ++-------------------------------------------- 41 extra/Configs/Config.arm | 125 ++--------------------------------------------
42 2 files changed, 5 insertions(+), 139 deletions(-) 42 2 files changed, 5 insertions(+), 139 deletions(-)
43 43
44diff --git a/Rules.mak b/Rules.mak 44diff --git a/Rules.mak b/Rules.mak
45index 2a16908..09741a6 100644 45index 2a16908..09741a6 100644
46--- a/Rules.mak 46--- a/Rules.mak
47+++ b/Rules.mak 47+++ b/Rules.mak
48@@ -332,25 +332,6 @@ ifeq ($(TARGET_ARCH),arm) 48@@ -332,25 +332,6 @@ ifeq ($(TARGET_ARCH),arm)
49 OPTIMIZATION+=-fstrict-aliasing 49 OPTIMIZATION+=-fstrict-aliasing
50 CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian 50 CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
51 CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian 51 CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
52- CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+= 52- CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
53- CPU_CFLAGS-$(CONFIG_ARM610)+=-mtune=arm610 -march=armv3 53- CPU_CFLAGS-$(CONFIG_ARM610)+=-mtune=arm610 -march=armv3
54- CPU_CFLAGS-$(CONFIG_ARM710)+=-mtune=arm710 -march=armv3 54- CPU_CFLAGS-$(CONFIG_ARM710)+=-mtune=arm710 -march=armv3
55- CPU_CFLAGS-$(CONFIG_ARM7TDMI)+=-mtune=arm7tdmi -march=armv4t 55- CPU_CFLAGS-$(CONFIG_ARM7TDMI)+=-mtune=arm7tdmi -march=armv4t
56- CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t 56- CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t
57- CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t 57- CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t
58- CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t 58- CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t
59- CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te 59- CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te
60- CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t 60- CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t
61- CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6 61- CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6
62- CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6 62- CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6
63- CPU_CFLAGS-$(CONFIG_ARM1176JZF_S)+=-mtune=arm1176jzf-s -march=armv6 63- CPU_CFLAGS-$(CONFIG_ARM1176JZF_S)+=-mtune=arm1176jzf-s -march=armv6
64- CPU_CFLAGS-$(CONFIG_ARM_SA110)+=-mtune=strongarm110 -march=armv4 64- CPU_CFLAGS-$(CONFIG_ARM_SA110)+=-mtune=strongarm110 -march=armv4
65- CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4 65- CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4
66- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110) 66- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)
67- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale 67- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale
68- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt 68- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
69- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 69- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3
70- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 70- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1
71 CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb 71 CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb
72 endif 72 endif
73 73
74diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm 74diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
75index c9c40d4..6c75a00 100644 75index c9c40d4..6c75a00 100644
76--- a/extra/Configs/Config.arm 76--- a/extra/Configs/Config.arm
77+++ b/extra/Configs/Config.arm 77+++ b/extra/Configs/Config.arm
78@@ -30,129 +30,14 @@ config CONFIG_ARM_EABI 78@@ -30,129 +30,14 @@ config CONFIG_ARM_EABI
79 79
80 endchoice 80 endchoice
81 81
82-choice 82-choice
83- prompt "Target Processor Type" 83- prompt "Target Processor Type"
84- default CONFIG_GENERIC_ARM 84- default CONFIG_GENERIC_ARM
85- help 85- help
86- This is the processor type of your CPU. This information is used for 86- This is the processor type of your CPU. This information is used for
87- optimizing purposes. To build a library that will run on all ARMCPU 87- optimizing purposes. To build a library that will run on all ARMCPU
88- types (albeit not optimally fast), you can specify "Generic Arm" here. 88- types (albeit not optimally fast), you can specify "Generic Arm" here.
89- If you pick anything other than "Generic Arm", there is no guarantee 89- If you pick anything other than "Generic Arm", there is no guarantee
90- that uClibc will even run on anything other than the selected 90- that uClibc will even run on anything other than the selected
91- processor type. 91- processor type.
92- 92-
93- Here are the settings recommended for greatest speed: 93- Here are the settings recommended for greatest speed:
94- - "Generic Arm" select this if your compiler is already setup to 94- - "Generic Arm" select this if your compiler is already setup to
95- optimize things properly, or if you want to run on pretty much 95- optimize things properly, or if you want to run on pretty much
96- everything, or you just don't much care. 96- everything, or you just don't much care.
97- - For anything else, pick the ARM core type that best matches the 97- - For anything else, pick the ARM core type that best matches the
98- cpu you will be using on your device. 98- cpu you will be using on your device.
99- 99-
100- If you don't know what to do, choose "Generic Arm". 100- If you don't know what to do, choose "Generic Arm".
101- 101-
102-config CONFIG_GENERIC_ARM 102-config CONFIG_GENERIC_ARM
103- bool "Generic Arm" 103- bool "Generic Arm"
104- 104-
105-config CONFIG_ARM610 105-config CONFIG_ARM610
106- bool "Arm 610" 106- bool "Arm 610"
107- select ARCH_HAS_MMU 107- select ARCH_HAS_MMU
108- 108-
109-config CONFIG_ARM710 109-config CONFIG_ARM710
110- bool "Arm 710" 110- bool "Arm 710"
111- select ARCH_HAS_MMU 111- select ARCH_HAS_MMU
112- 112-
113-config CONFIG_ARM7TDMI 113-config CONFIG_ARM7TDMI
114- bool "Arm 7TDMI" 114- bool "Arm 7TDMI"
115- select ARCH_HAS_NO_MMU 115- select ARCH_HAS_NO_MMU
116- select HAS_THUMB 116- select HAS_THUMB
117- 117-
118-config CONFIG_ARM720T 118-config CONFIG_ARM720T
119- bool "Arm 720T" 119- bool "Arm 720T"
120- select ARCH_HAS_MMU 120- select ARCH_HAS_MMU
121- select HAS_THUMB 121- select HAS_THUMB
122- 122-
123-config CONFIG_ARM920T 123-config CONFIG_ARM920T
124- bool "Arm 920T" 124- bool "Arm 920T"
125- select ARCH_HAS_MMU 125- select ARCH_HAS_MMU
126- select HAS_THUMB 126- select HAS_THUMB
127- 127-
128-config CONFIG_ARM922T 128-config CONFIG_ARM922T
129- bool "Arm 922T" 129- bool "Arm 922T"
130- select ARCH_HAS_MMU 130- select ARCH_HAS_MMU
131- select HAS_THUMB 131- select HAS_THUMB
132- 132-
133-config CONFIG_ARM926T 133-config CONFIG_ARM926T
134- bool "Arm 926T" 134- bool "Arm 926T"
135- select ARCH_HAS_MMU 135- select ARCH_HAS_MMU
136- select HAS_THUMB 136- select HAS_THUMB
137- 137-
138-config CONFIG_ARM10T 138-config CONFIG_ARM10T
139- bool "Arm 10T" 139- bool "Arm 10T"
140- select ARCH_HAS_MMU 140- select ARCH_HAS_MMU
141- select HAS_THUMB 141- select HAS_THUMB
142- 142-
143-config CONFIG_ARM1136JF_S 143-config CONFIG_ARM1136JF_S
144- bool "Arm 1136JF-S" 144- bool "Arm 1136JF-S"
145- select ARCH_HAS_MMU 145- select ARCH_HAS_MMU
146- select HAS_THUMB 146- select HAS_THUMB
147- 147-
148-config CONFIG_ARM1176JZ_S 148-config CONFIG_ARM1176JZ_S
149- bool "Arm 1176JZ-S" 149- bool "Arm 1176JZ-S"
150- select ARCH_HAS_MMU 150- select ARCH_HAS_MMU
151- select HAS_THUMB 151- select HAS_THUMB
152- 152-
153-config CONFIG_ARM1176JZF_S 153-config CONFIG_ARM1176JZF_S
154- bool "Arm 1176JZF-S" 154- bool "Arm 1176JZF-S"
155- select ARCH_HAS_MMU 155- select ARCH_HAS_MMU
156- select HAS_THUMB 156- select HAS_THUMB
157- 157-
158-config CONFIG_ARM_CORTEX_M3 158-config CONFIG_ARM_CORTEX_M3
159- bool "Arm Cortex-M3" 159- bool "Arm Cortex-M3"
160- select ARCH_HAS_NO_MMU 160- select ARCH_HAS_NO_MMU
161- select FORCE_THUMB 161- select FORCE_THUMB
162- 162-
163-config CONFIG_ARM_CORTEX_M1 163-config CONFIG_ARM_CORTEX_M1
164- bool "Arm Cortex-M1" 164- bool "Arm Cortex-M1"
165- select ARCH_HAS_NO_MMU 165- select ARCH_HAS_NO_MMU
166- select FORCE_THUMB 166- select FORCE_THUMB
167- 167-
168-config CONFIG_ARM_SA110 168-config CONFIG_ARM_SA110
169- bool "Intel StrongArm SA-110" 169- bool "Intel StrongArm SA-110"
170- select ARCH_HAS_MMU 170- select ARCH_HAS_MMU
171- select HAS_THUMB 171- select HAS_THUMB
172- 172-
173-config CONFIG_ARM_SA1100 173-config CONFIG_ARM_SA1100
174- bool "Intel StrongArm SA-1100" 174- bool "Intel StrongArm SA-1100"
175- select ARCH_HAS_MMU 175- select ARCH_HAS_MMU
176- select HAS_THUMB 176- select HAS_THUMB
177- 177-
178-config CONFIG_ARM_XSCALE 178-config CONFIG_ARM_XSCALE
179- bool "Intel Xscale" 179- bool "Intel Xscale"
180- select ARCH_HAS_MMU 180- select ARCH_HAS_MMU
181- select HAS_THUMB 181- select HAS_THUMB
182- 182-
183-config CONFIG_ARM_IWMMXT 183-config CONFIG_ARM_IWMMXT
184- bool "Intel Xscale With WMMX PXA27x" 184- bool "Intel Xscale With WMMX PXA27x"
185- select ARCH_HAS_MMU 185- select ARCH_HAS_MMU
186- select HAS_THUMB 186- select HAS_THUMB
187- 187-
188-endchoice 188-endchoice
189- 189-
190-config HAS_THUMB 190-config HAS_THUMB
191- bool 191- bool
192- 192-
193-config FORCE_THUMB 193-config FORCE_THUMB
194- bool 194- bool
195- select HAS_THUMB 195- select HAS_THUMB
196- select COMPILE_IN_THUMB_MODE 196- select COMPILE_IN_THUMB_MODE
197- select USE_BX 197- select USE_BX
198- 198-
199 config COMPILE_IN_THUMB_MODE 199 config COMPILE_IN_THUMB_MODE
200- bool 200- bool
201+ bool "Build using Thumb mode" 201+ bool "Build using Thumb mode"
202+ select USE_BX 202+ select USE_BX
203+ help 203+ help
204+ Say 'y' here to force building uClibc in thumb mode. 204+ Say 'y' here to force building uClibc in thumb mode.
205+ Say 'n' to use your compiler's default mode. 205+ Say 'n' to use your compiler's default mode.
206 206
207 config USE_BX 207 config USE_BX
208 bool "Use BX in function return" 208 bool "Use BX in function return"
209- default y 209- default y
210- depends on HAS_THUMB 210- depends on HAS_THUMB
211 help 211 help
212 Use BX instruction for THUMB aware architectures. 212 Use BX instruction for THUMB aware architectures.
213-- 213--
2141.7.1 2141.7.1
215 215
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
index 7967794a42..b19408f1b2 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
@@ -1,172 +1,172 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313301agb; 2Received: by 10.90.86.4 with SMTP id j4cs313301agb;
3 Sat, 8 Jan 2011 16:45:17 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:17 -0800 (PST)
4Received: by 10.216.186.82 with SMTP id v60mr20017574wem.56.1294533916559; 4Received: by 10.216.186.82 with SMTP id v60mr20017574wem.56.1294533916559;
5 Sat, 08 Jan 2011 16:45:16 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:16 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id o13si33755824wee.56.2011.01.08.16.45.16; 8 by mx.google.com with ESMTP id o13si33755824wee.56.2011.01.08.16.45.16;
9 Sat, 08 Jan 2011 16:45:16 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:16 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClFDL; Sun, 09 Jan 2011 01:45:16 +0100 14 id tClC1f0024v5z3u03ClFDL; Sun, 09 Jan 2011 01:45:16 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 2/7] ARM: introduce blind options to select & force THUMB mode 20Subject: [PATCH 2/7] ARM: introduce blind options to select & force THUMB mode
21Date: Sun, 9 Jan 2011 01:45:05 +0100 21Date: Sun, 9 Jan 2011 01:45:05 +0100
22Message-Id: <1294533910-19305-3-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-3-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27Add three new blind options to set use of Thumb mode: 27Add three new blind options to set use of Thumb mode:
28- COMPILE_IN_THUMB_MODE 28- COMPILE_IN_THUMB_MODE
29 - if set, CFLAGS will contain -mthumb 29 - if set, CFLAGS will contain -mthumb
30 - if unset, the compiler's default is used 30 - if unset, the compiler's default is used
31- HAS_THUMB 31- HAS_THUMB
32 - CPUS with Thumb instruction set can select this 32 - CPUS with Thumb instruction set can select this
33 - use of BX depends on this 33 - use of BX depends on this
34- FORCE_THUMB 34- FORCE_THUMB
35 - CPUs that are Thumb-only must select this 35 - CPUs that are Thumb-only must select this
36 - this selects: HAS_THUMB, COMPILE_IN_THUMB_MODE and USE_BX 36 - this selects: HAS_THUMB, COMPILE_IN_THUMB_MODE and USE_BX
37 37
38Also, remove leading space in Rules.mak. 38Also, remove leading space in Rules.mak.
39 39
40Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 40Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
41Cc: Khem Raj <raj.khem@gmail.com> 41Cc: Khem Raj <raj.khem@gmail.com>
42Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 42Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
43Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 43Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
44--- 44---
45 Rules.mak | 7 ++++--- 45 Rules.mak | 7 ++++---
46 extra/Configs/Config.arm | 31 ++++++++++++++++++++++++++++--- 46 extra/Configs/Config.arm | 31 ++++++++++++++++++++++++++++---
47 2 files changed, 32 insertions(+), 6 deletions(-) 47 2 files changed, 32 insertions(+), 6 deletions(-)
48 48
49diff --git a/Rules.mak b/Rules.mak 49diff --git a/Rules.mak b/Rules.mak
50index eecdc64..2a16908 100644 50index eecdc64..2a16908 100644
51--- a/Rules.mak 51--- a/Rules.mak
52+++ b/Rules.mak 52+++ b/Rules.mak
53@@ -348,9 +348,10 @@ ifeq ($(TARGET_ARCH),arm) 53@@ -348,9 +348,10 @@ ifeq ($(TARGET_ARCH),arm)
54 CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4 54 CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4
55 CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110) 55 CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)
56 CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale 56 CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale
57- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt 57- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
58- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 -mthumb 58- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 -mthumb
59- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 -mthumb 59- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 -mthumb
60+ CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt 60+ CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
61+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 61+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3
62+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 62+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1
63+ CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb 63+ CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb
64 endif 64 endif
65 65
66 ifeq ($(TARGET_ARCH),mips) 66 ifeq ($(TARGET_ARCH),mips)
67diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm 67diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
68index 3b90e67..c9c40d4 100644 68index 3b90e67..c9c40d4 100644
69--- a/extra/Configs/Config.arm 69--- a/extra/Configs/Config.arm
70+++ b/extra/Configs/Config.arm 70+++ b/extra/Configs/Config.arm
71@@ -64,70 +64,95 @@ config CONFIG_ARM710 71@@ -64,70 +64,95 @@ config CONFIG_ARM710
72 config CONFIG_ARM7TDMI 72 config CONFIG_ARM7TDMI
73 bool "Arm 7TDMI" 73 bool "Arm 7TDMI"
74 select ARCH_HAS_NO_MMU 74 select ARCH_HAS_NO_MMU
75+ select HAS_THUMB 75+ select HAS_THUMB
76 76
77 config CONFIG_ARM720T 77 config CONFIG_ARM720T
78 bool "Arm 720T" 78 bool "Arm 720T"
79 select ARCH_HAS_MMU 79 select ARCH_HAS_MMU
80+ select HAS_THUMB 80+ select HAS_THUMB
81 81
82 config CONFIG_ARM920T 82 config CONFIG_ARM920T
83 bool "Arm 920T" 83 bool "Arm 920T"
84 select ARCH_HAS_MMU 84 select ARCH_HAS_MMU
85+ select HAS_THUMB 85+ select HAS_THUMB
86 86
87 config CONFIG_ARM922T 87 config CONFIG_ARM922T
88 bool "Arm 922T" 88 bool "Arm 922T"
89 select ARCH_HAS_MMU 89 select ARCH_HAS_MMU
90+ select HAS_THUMB 90+ select HAS_THUMB
91 91
92 config CONFIG_ARM926T 92 config CONFIG_ARM926T
93 bool "Arm 926T" 93 bool "Arm 926T"
94 select ARCH_HAS_MMU 94 select ARCH_HAS_MMU
95+ select HAS_THUMB 95+ select HAS_THUMB
96 96
97 config CONFIG_ARM10T 97 config CONFIG_ARM10T
98 bool "Arm 10T" 98 bool "Arm 10T"
99 select ARCH_HAS_MMU 99 select ARCH_HAS_MMU
100+ select HAS_THUMB 100+ select HAS_THUMB
101 101
102 config CONFIG_ARM1136JF_S 102 config CONFIG_ARM1136JF_S
103 bool "Arm 1136JF-S" 103 bool "Arm 1136JF-S"
104 select ARCH_HAS_MMU 104 select ARCH_HAS_MMU
105+ select HAS_THUMB 105+ select HAS_THUMB
106 106
107 config CONFIG_ARM1176JZ_S 107 config CONFIG_ARM1176JZ_S
108 bool "Arm 1176JZ-S" 108 bool "Arm 1176JZ-S"
109 select ARCH_HAS_MMU 109 select ARCH_HAS_MMU
110+ select HAS_THUMB 110+ select HAS_THUMB
111 111
112 config CONFIG_ARM1176JZF_S 112 config CONFIG_ARM1176JZF_S
113 bool "Arm 1176JZF-S" 113 bool "Arm 1176JZF-S"
114 select ARCH_HAS_MMU 114 select ARCH_HAS_MMU
115+ select HAS_THUMB 115+ select HAS_THUMB
116 116
117 config CONFIG_ARM_CORTEX_M3 117 config CONFIG_ARM_CORTEX_M3
118 bool "Arm Cortex-M3" 118 bool "Arm Cortex-M3"
119 select ARCH_HAS_NO_MMU 119 select ARCH_HAS_NO_MMU
120- select USE_BX 120- select USE_BX
121+ select FORCE_THUMB 121+ select FORCE_THUMB
122 122
123 config CONFIG_ARM_CORTEX_M1 123 config CONFIG_ARM_CORTEX_M1
124 bool "Arm Cortex-M1" 124 bool "Arm Cortex-M1"
125 select ARCH_HAS_NO_MMU 125 select ARCH_HAS_NO_MMU
126- select USE_BX 126- select USE_BX
127+ select FORCE_THUMB 127+ select FORCE_THUMB
128 128
129 config CONFIG_ARM_SA110 129 config CONFIG_ARM_SA110
130 bool "Intel StrongArm SA-110" 130 bool "Intel StrongArm SA-110"
131 select ARCH_HAS_MMU 131 select ARCH_HAS_MMU
132+ select HAS_THUMB 132+ select HAS_THUMB
133 133
134 config CONFIG_ARM_SA1100 134 config CONFIG_ARM_SA1100
135 bool "Intel StrongArm SA-1100" 135 bool "Intel StrongArm SA-1100"
136 select ARCH_HAS_MMU 136 select ARCH_HAS_MMU
137+ select HAS_THUMB 137+ select HAS_THUMB
138 138
139 config CONFIG_ARM_XSCALE 139 config CONFIG_ARM_XSCALE
140 bool "Intel Xscale" 140 bool "Intel Xscale"
141 select ARCH_HAS_MMU 141 select ARCH_HAS_MMU
142+ select HAS_THUMB 142+ select HAS_THUMB
143 143
144 config CONFIG_ARM_IWMMXT 144 config CONFIG_ARM_IWMMXT
145 bool "Intel Xscale With WMMX PXA27x" 145 bool "Intel Xscale With WMMX PXA27x"
146 select ARCH_HAS_MMU 146 select ARCH_HAS_MMU
147+ select HAS_THUMB 147+ select HAS_THUMB
148 148
149 endchoice 149 endchoice
150 150
151+config HAS_THUMB 151+config HAS_THUMB
152+ bool 152+ bool
153+ 153+
154+config FORCE_THUMB 154+config FORCE_THUMB
155+ bool 155+ bool
156+ select HAS_THUMB 156+ select HAS_THUMB
157+ select COMPILE_IN_THUMB_MODE 157+ select COMPILE_IN_THUMB_MODE
158+ select USE_BX 158+ select USE_BX
159+ 159+
160+config COMPILE_IN_THUMB_MODE 160+config COMPILE_IN_THUMB_MODE
161+ bool 161+ bool
162+ 162+
163 config USE_BX 163 config USE_BX
164 bool "Use BX in function return" 164 bool "Use BX in function return"
165 default y 165 default y
166- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710 166- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
167+ depends on HAS_THUMB 167+ depends on HAS_THUMB
168 help 168 help
169 Use BX instruction for THUMB aware architectures. 169 Use BX instruction for THUMB aware architectures.
170-- 170--
1711.7.1 1711.7.1
172 172
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
index 7acd5d17f6..82970ca458 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
@@ -1,39 +1,39 @@
1Delivered-To: raj.khem@gmail.com 1Delivered-To: raj.khem@gmail.com
2Received: by 10.90.86.4 with SMTP id j4cs313305agb; 2Received: by 10.90.86.4 with SMTP id j4cs313305agb;
3 Sat, 8 Jan 2011 16:45:19 -0800 (PST) 3 Sat, 8 Jan 2011 16:45:19 -0800 (PST)
4Received: by 10.216.153.210 with SMTP id f60mr573848wek.114.1294533918335; 4Received: by 10.216.153.210 with SMTP id f60mr573848wek.114.1294533918335;
5 Sat, 08 Jan 2011 16:45:18 -0800 (PST) 5 Sat, 08 Jan 2011 16:45:18 -0800 (PST)
6Return-Path: <yann.morin.1998@anciens.enib.fr> 6Return-Path: <yann.morin.1998@anciens.enib.fr>
7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) 7Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
8 by mx.google.com with ESMTP id n4si33737071wej.152.2011.01.08.16.45.17; 8 by mx.google.com with ESMTP id n4si33737071wej.152.2011.01.08.16.45.17;
9 Sat, 08 Jan 2011 16:45:18 -0800 (PST) 9 Sat, 08 Jan 2011 16:45:18 -0800 (PST)
10Received-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; 10Received-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;
11Authentication-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 11Authentication-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
12Received: from roazhon.bzh.lan ([90.32.245.227]) 12Received: from roazhon.bzh.lan ([90.32.245.227])
13 by mwinf5d24 with ME 13 by mwinf5d24 with ME
14 id tClC1f0024v5z3u03ClGDX; Sun, 09 Jan 2011 01:45:17 +0100 14 id tClC1f0024v5z3u03ClGDX; Sun, 09 Jan 2011 01:45:17 +0100
15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 15From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
16To: uclibc@uclibc.org 16To: uclibc@uclibc.org
17Cc: Khem Raj <raj.khem@gmail.com>, 17Cc: Khem Raj <raj.khem@gmail.com>,
18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>, 18 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
19 Carmelo AMOROSO <carmelo.amoroso@st.com> 19 Carmelo AMOROSO <carmelo.amoroso@st.com>
20Subject: [PATCH 4/7] ARM: transform the EABI/OABI choice into a boolean 20Subject: [PATCH 4/7] ARM: transform the EABI/OABI choice into a boolean
21Date: Sun, 9 Jan 2011 01:45:07 +0100 21Date: Sun, 9 Jan 2011 01:45:07 +0100
22Message-Id: <1294533910-19305-5-git-send-email-yann.morin.1998@anciens.enib.fr> 22Message-Id: <1294533910-19305-5-git-send-email-yann.morin.1998@anciens.enib.fr>
23X-Mailer: git-send-email 1.7.1 23X-Mailer: git-send-email 1.7.1
24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 24In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> 25References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
26 26
27The CONFIG_ARM_OABI option is never used. 27The CONFIG_ARM_OABI option is never used.
28 28
29Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 29Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
30Cc: Khem Raj <raj.khem@gmail.com> 30Cc: Khem Raj <raj.khem@gmail.com>
31Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> 31Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
32Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> 32Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
33--- 33---
34 extra/Configs/Config.arm | 23 ++++++++--------------- 34 extra/Configs/Config.arm | 23 ++++++++---------------
35 1 files changed, 8 insertions(+), 15 deletions(-) 35 1 files changed, 8 insertions(+), 15 deletions(-)
36 36
37Index: git/extra/Configs/Config.arm 37Index: git/extra/Configs/Config.arm
38=================================================================== 38===================================================================
39--- git.orig/extra/Configs/Config.arm 39--- git.orig/extra/Configs/Config.arm
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/mkfs-xin-fixes.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/mkfs-xin-fixes.patch
index 47fc97725a..847e870669 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/mkfs-xin-fixes.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/mkfs-xin-fixes.patch
@@ -1,183 +1,183 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3This patch is made by xin.zhong@intel.com to implement these supported 3This patch is made by xin.zhong@intel.com to implement these supported
4features in mkfs.btrfs: 4features in mkfs.btrfs:
5 * populate fs image from a directory while creating it 5 * populate fs image from a directory while creating it
6 * reduce minimum size of the created image from 256MB to around 24MB 6 * reduce minimum size of the created image from 256MB to around 24MB
7 * while creating image use the specified device name rather than output.img 7 * while creating image use the specified device name rather than output.img
8 8
9Patch tested and incorporated in poky by: 9Patch tested and incorporated in poky by:
10Nitin A Kamble <nitin.a.kamble@intel.com> 2011/06/20 10Nitin A Kamble <nitin.a.kamble@intel.com> 2011/06/20
11 11
12diff --git a/file-item.c b/file-item.c 12diff --git a/file-item.c b/file-item.c
13index 9732282..aed42c3 100644 13index 9732282..aed42c3 100644
14--- a/file-item.c 14--- a/file-item.c
15+++ b/file-item.c 15+++ b/file-item.c
16@@ -193,7 +193,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans, 16@@ -193,7 +193,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
17 struct btrfs_root *root, u64 alloc_end, 17 struct btrfs_root *root, u64 alloc_end,
18 u64 bytenr, char *data, size_t len) 18 u64 bytenr, char *data, size_t len)
19 { 19 {
20- int ret; 20- int ret;
21+ int ret = 0; 21+ int ret = 0;
22 struct btrfs_key file_key; 22 struct btrfs_key file_key;
23 struct btrfs_key found_key; 23 struct btrfs_key found_key;
24 u64 next_offset = (u64)-1; 24 u64 next_offset = (u64)-1;
25diff --git a/mkfs.c b/mkfs.c 25diff --git a/mkfs.c b/mkfs.c
26index 57c88f9..e953a33 100644 26index 57c88f9..e953a33 100644
27--- a/mkfs.c 27--- a/mkfs.c
28+++ b/mkfs.c 28+++ b/mkfs.c
29@@ -36,7 +36,7 @@ 29@@ -36,7 +36,7 @@
30 #include <uuid/uuid.h> 30 #include <uuid/uuid.h>
31 #include <linux/fs.h> 31 #include <linux/fs.h>
32 #include <ctype.h> 32 #include <ctype.h>
33-#include <attr/xattr.h> 33-#include <attr/xattr.h>
34+#include <sys/xattr.h> 34+#include <sys/xattr.h>
35 #include "kerncompat.h" 35 #include "kerncompat.h"
36 #include "ctree.h" 36 #include "ctree.h"
37 #include "disk-io.h" 37 #include "disk-io.h"
38@@ -517,7 +517,6 @@ static int add_inode_items(struct btrfs_trans_handle *trans, 38@@ -517,7 +517,6 @@ static int add_inode_items(struct btrfs_trans_handle *trans,
39 fail: 39 fail:
40 return ret; 40 return ret;
41 } 41 }
42- 42-
43 static int add_xattr_item(struct btrfs_trans_handle *trans, 43 static int add_xattr_item(struct btrfs_trans_handle *trans,
44 struct btrfs_root *root, u64 objectid, 44 struct btrfs_root *root, u64 objectid,
45 const char *file_name) 45 const char *file_name)
46@@ -532,8 +531,10 @@ static int add_xattr_item(struct btrfs_trans_handle *trans, 46@@ -532,8 +531,10 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
47 47
48 ret = llistxattr(file_name, xattr_list, XATTR_LIST_MAX); 48 ret = llistxattr(file_name, xattr_list, XATTR_LIST_MAX);
49 if (ret < 0) { 49 if (ret < 0) {
50- fprintf(stderr, "get a list of xattr failed for %s\n", 50- fprintf(stderr, "get a list of xattr failed for %s\n",
51- file_name); 51- file_name);
52+ if(errno == ENOTSUP) 52+ if(errno == ENOTSUP)
53+ return 0; 53+ return 0;
54+ fprintf(stderr, "get a list of xattr failed for %s errno %d\n", 54+ fprintf(stderr, "get a list of xattr failed for %s errno %d\n",
55+ file_name, errno); 55+ file_name, errno);
56 return ret; 56 return ret;
57 } 57 }
58 if (ret == 0) 58 if (ret == 0)
59@@ -546,8 +547,11 @@ static int add_xattr_item(struct btrfs_trans_handle *trans, 59@@ -546,8 +547,11 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
60 60
61 ret = getxattr(file_name, cur_name, cur_value, XATTR_SIZE_MAX); 61 ret = getxattr(file_name, cur_name, cur_value, XATTR_SIZE_MAX);
62 if (ret < 0) { 62 if (ret < 0) {
63- fprintf(stderr, "get a xattr value failed for %s\n", 63- fprintf(stderr, "get a xattr value failed for %s\n",
64- cur_name); 64- cur_name);
65+ if(errno == ENOTSUP) 65+ if(errno == ENOTSUP)
66+ return 0; 66+ return 0;
67+ fprintf(stderr, "get a xattr value failed for %s attr %s errno %d\n", 67+ fprintf(stderr, "get a xattr value failed for %s attr %s errno %d\n",
68+ file_name, cur_name, errno); 68+ file_name, cur_name, errno);
69+ return ret; 69+ return ret;
70 } 70 }
71 71
72 ret = btrfs_insert_xattr_item(trans, root, cur_name, 72 ret = btrfs_insert_xattr_item(trans, root, cur_name,
73@@ -563,7 +567,6 @@ static int add_xattr_item(struct btrfs_trans_handle *trans, 73@@ -563,7 +567,6 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
74 74
75 return ret; 75 return ret;
76 } 76 }
77- 77-
78 static int custom_alloc_extent(struct btrfs_root *root, u64 num_bytes, 78 static int custom_alloc_extent(struct btrfs_root *root, u64 num_bytes,
79 u64 hint_byte, struct btrfs_key *ins) 79 u64 hint_byte, struct btrfs_key *ins)
80 { 80 {
81@@ -923,27 +926,27 @@ static int traverse_directory(struct btrfs_trans_handle *trans, 81@@ -923,27 +926,27 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
82 fprintf(stderr, "add_inode_items failed\n"); 82 fprintf(stderr, "add_inode_items failed\n");
83 goto fail; 83 goto fail;
84 } 84 }
85- 85-
86 ret = add_xattr_item(trans, root, 86 ret = add_xattr_item(trans, root,
87 cur_inum, cur_file->d_name); 87 cur_inum, cur_file->d_name);
88 if (ret) { 88 if (ret) {
89 fprintf(stderr, "add_xattr_item failed\n"); 89 fprintf(stderr, "add_xattr_item failed\n");
90- goto fail; 90- goto fail;
91+ if(ret != -ENOTSUP) 91+ if(ret != -ENOTSUP)
92+ goto fail; 92+ goto fail;
93 } 93 }
94- 94-
95 if (S_ISDIR(st.st_mode)) { 95 if (S_ISDIR(st.st_mode)) {
96 dir_entry = malloc(sizeof(struct directory_name_entry)); 96 dir_entry = malloc(sizeof(struct directory_name_entry));
97 dir_entry->dir_name = cur_file->d_name; 97 dir_entry->dir_name = cur_file->d_name;
98 dir_entry->path = make_path(parent_dir_entry->path, 98 dir_entry->path = make_path(parent_dir_entry->path,
99 cur_file->d_name); 99 cur_file->d_name);
100 dir_entry->inum = cur_inum; 100 dir_entry->inum = cur_inum;
101- list_add_tail(&dir_entry->list, &dir_head->list); 101- list_add_tail(&dir_entry->list, &dir_head->list);
102+ list_add_tail(&dir_entry->list, &dir_head->list); 102+ list_add_tail(&dir_entry->list, &dir_head->list);
103 } else if (S_ISREG(st.st_mode)) { 103 } else if (S_ISREG(st.st_mode)) {
104 ret = add_file_items(trans, root, &cur_inode, 104 ret = add_file_items(trans, root, &cur_inode,
105 cur_inum, parent_inum, &st, 105 cur_inum, parent_inum, &st,
106 cur_file->d_name, out_fd); 106 cur_file->d_name, out_fd);
107 if (ret) { 107 if (ret) {
108- fprintf(stderr, "add_file_items failed\n"); 108- fprintf(stderr, "add_file_items failed\n");
109+ fprintf(stderr, "add_file_items failed %s\n", 109+ fprintf(stderr, "add_file_items failed %s\n",
110+ cur_file->d_name); 110+ cur_file->d_name);
111 goto fail; 111 goto fail;
112 } 112 }
113 } else if (S_ISLNK(st.st_mode)) { 113 } else if (S_ISLNK(st.st_mode)) {
114@@ -987,7 +990,7 @@ static int create_chunks(struct btrfs_trans_handle *trans, 114@@ -987,7 +990,7 @@ static int create_chunks(struct btrfs_trans_handle *trans,
115 u64 chunk_size; 115 u64 chunk_size;
116 u64 meta_type = BTRFS_BLOCK_GROUP_METADATA; 116 u64 meta_type = BTRFS_BLOCK_GROUP_METADATA;
117 u64 data_type = BTRFS_BLOCK_GROUP_DATA; 117 u64 data_type = BTRFS_BLOCK_GROUP_DATA;
118- u64 minimum_data_chunk_size = 64 * 1024 * 1024; 118- u64 minimum_data_chunk_size = 64 * 1024 * 1024;
119+ u64 minimum_data_chunk_size = 8 * 1024 * 1024; 119+ u64 minimum_data_chunk_size = 8 * 1024 * 1024;
120 u64 i; 120 u64 i;
121 int ret; 121 int ret;
122 122
123@@ -1062,7 +1065,6 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize, 123@@ -1062,7 +1065,6 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize,
124 char path[512]; 124 char path[512];
125 char *file_name = "temp_file"; 125 char *file_name = "temp_file";
126 FILE *file; 126 FILE *file;
127- u64 minimum_data_size = 256 * 1024 * 1024; /* 256MB */ 127- u64 minimum_data_size = 256 * 1024 * 1024; /* 256MB */
128 u64 default_chunk_size = 8 * 1024 * 1024; /* 8MB */ 128 u64 default_chunk_size = 8 * 1024 * 1024; /* 8MB */
129 u64 allocated_meta_size = 8 * 1024 * 1024; /* 8MB */ 129 u64 allocated_meta_size = 8 * 1024 * 1024; /* 8MB */
130 u64 allocated_total_size = 20 * 1024 * 1024; /* 20MB */ 130 u64 allocated_total_size = 20 * 1024 * 1024; /* 20MB */
131@@ -1101,9 +1103,6 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize, 131@@ -1101,9 +1103,6 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize,
132 132
133 *num_of_meta_chunks_ret = num_of_meta_chunks; 133 *num_of_meta_chunks_ret = num_of_meta_chunks;
134 134
135- if (total_size < minimum_data_size) 135- if (total_size < minimum_data_size)
136- total_size = minimum_data_size; 136- total_size = minimum_data_size;
137- 137-
138 return total_size; 138 return total_size;
139 } 139 }
140 140
141@@ -1158,9 +1157,9 @@ int main(int ac, char **av) 141@@ -1158,9 +1157,9 @@ int main(int ac, char **av)
142 142
143 char *source_dir = NULL; 143 char *source_dir = NULL;
144 int source_dir_set = 0; 144 int source_dir_set = 0;
145- char *output = "output.img"; 145- char *output = "output.img";
146 u64 num_of_meta_chunks = 0; 146 u64 num_of_meta_chunks = 0;
147 u64 size_of_data = 0; 147 u64 size_of_data = 0;
148+ u64 source_dir_size = 0; 148+ u64 source_dir_size = 0;
149 149
150 while(1) { 150 while(1) {
151 int c; 151 int c;
152@@ -1224,8 +1223,6 @@ int main(int ac, char **av) 152@@ -1224,8 +1223,6 @@ int main(int ac, char **av)
153 fprintf(stderr, "Illegal nodesize %u\n", nodesize); 153 fprintf(stderr, "Illegal nodesize %u\n", nodesize);
154 exit(1); 154 exit(1);
155 } 155 }
156- if (source_dir_set) 156- if (source_dir_set)
157- ac++; 157- ac++;
158 ac = ac - optind; 158 ac = ac - optind;
159 if (ac == 0) 159 if (ac == 0)
160 print_usage(); 160 print_usage();
161@@ -1257,17 +1254,19 @@ int main(int ac, char **av) 161@@ -1257,17 +1254,19 @@ int main(int ac, char **av)
162 block_count = dev_block_count; 162 block_count = dev_block_count;
163 } else { 163 } else {
164 ac = 0; 164 ac = 0;
165- fd = open_target(output); 165- fd = open_target(output);
166+ file = av[optind++]; 166+ file = av[optind++];
167+ fd = open_target(file); 167+ fd = open_target(file);
168 if (fd < 0) { 168 if (fd < 0) {
169 fprintf(stderr, "unable to open the %s\n", file); 169 fprintf(stderr, "unable to open the %s\n", file);
170 exit(1); 170 exit(1);
171 } 171 }
172 172
173- file = output; 173- file = output;
174 first_fd = fd; 174 first_fd = fd;
175 first_file = file; 175 first_file = file;
176- block_count = size_sourcedir(source_dir, sectorsize, 176- block_count = size_sourcedir(source_dir, sectorsize,
177+ source_dir_size = size_sourcedir(source_dir, sectorsize, 177+ source_dir_size = size_sourcedir(source_dir, sectorsize,
178 &num_of_meta_chunks, &size_of_data); 178 &num_of_meta_chunks, &size_of_data);
179+ if(block_count < source_dir_size) 179+ if(block_count < source_dir_size)
180+ block_count = source_dir_size; 180+ block_count = source_dir_size;
181 ret = zero_output_file(fd, block_count, sectorsize); 181 ret = zero_output_file(fd, block_count, sectorsize);
182 if (ret) { 182 if (ret) {
183 fprintf(stderr, "unable to zero the output file\n"); 183 fprintf(stderr, "unable to zero the output file\n");
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
index 94b1e32960..bcdbe24d06 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
+++ b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
@@ -9,11 +9,11 @@ Index: clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h
9--- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h 2008-12-16 06:42:10.000000000 -0800 9--- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h 2008-12-16 06:42:10.000000000 -0800
10+++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h 2011-07-20 16:41:02.046430743 -0700 10+++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h 2011-07-20 16:41:02.046430743 -0700
11@@ -60,7 +60,7 @@ 11@@ -60,7 +60,7 @@
12 #ifdef _MSC_VER 12 #ifdef _MSC_VER
13 return _finite(x) != 0; 13 return _finite(x) != 0;
14 #else 14 #else
15- return finite(x) != 0; 15- return finite(x) != 0;
16+ return std::isfinite(x) != 0; 16+ return std::isfinite(x) != 0;
17 #endif 17 #endif
18 } 18 }
19 19
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 14:41:12 +0000