diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 10:04:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-22 10:04:04 +0100 |
commit | c9c14a198de1b44462184c03bc3f9be4848adfd8 (patch) | |
tree | 24a8a031b89da6af317bc8dd44c37a3e8ed3e0fe /meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch | |
parent | e803c58ffb05e6d1f5938f1bfe6dfca9e3c26e02 (diff) | |
download | poky-c9c14a198de1b44462184c03bc3f9be4848adfd8.tar.gz |
Sync patches with DOS line endings that became corrupted
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch | 150 |
1 files changed, 75 insertions, 75 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 @@ | |||
1 | Delivered-To: raj.khem@gmail.com | 1 | Delivered-To: raj.khem@gmail.com |
2 | Received: by 10.90.86.4 with SMTP id j4cs313307agb; | 2 | Received: 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) |
4 | Received: by 10.227.141.78 with SMTP id l14mr16920947wbu.128.1294533919168; | 4 | Received: 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) |
6 | Return-Path: <yann.morin.1998@anciens.enib.fr> | 6 | Return-Path: <yann.morin.1998@anciens.enib.fr> |
7 | Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123]) | 7 | Received: 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) |
10 | 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; | 10 | 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; |
11 | 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 | 11 | 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 |
12 | Received: from roazhon.bzh.lan ([90.32.245.227]) | 12 | Received: 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 |
15 | From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 15 | From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
16 | To: uclibc@uclibc.org | 16 | To: uclibc@uclibc.org |
17 | Cc: Khem Raj <raj.khem@gmail.com>, | 17 | Cc: 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> |
20 | Subject: [PATCH 6/7] ARM: detect BX availibility at build time | 20 | Subject: [PATCH 6/7] ARM: detect BX availibility at build time |
21 | Date: Sun, 9 Jan 2011 01:45:09 +0100 | 21 | Date: Sun, 9 Jan 2011 01:45:09 +0100 |
22 | Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr> | 22 | Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr> |
23 | X-Mailer: git-send-email 1.7.1 | 23 | X-Mailer: git-send-email 1.7.1 |
24 | In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> | 24 | In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> |
25 | References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> | 25 | References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr> |
26 | 26 | ||
27 | The "use BX" option is now a suggestion that BX be used if available. | 27 | The "use BX" option is now a suggestion that BX be used if available. |
28 | Use a macro to detect if BX is available at build time. If so, and | 28 | Use a macro to detect if BX is available at build time. If so, and |
29 | the user requested it be used, then use it. Otherwise, error out. | 29 | the user requested it be used, then use it. Otherwise, error out. |
30 | 30 | ||
31 | Macro courtesy Khem RAJ: | 31 | Macro 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 | ||
34 | Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 34 | Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
35 | Cc: Khem Raj <raj.khem@gmail.com> | 35 | Cc: Khem Raj <raj.khem@gmail.com> |
36 | Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 36 | Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> |
37 | Cc: Carmelo AMOROSO <carmelo.amoroso@st.com> | 37 | Cc: 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 | ||
43 | diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm | 43 | diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm |
44 | index 227b90c..9aa9e56 100644 | 44 | index 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. |
55 | diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h | 55 | diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h |
56 | index 1d87df6..921c9a3 100644 | 56 | index 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 | -- |
74 | 1.7.1 | 74 | 1.7.1 |
75 | 75 | ||