aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-02-02 20:19:28 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-02-02 20:19:28 +0000
commit247e9192231dcf9db2c88173b1e76cb18abf9db5 (patch)
tree659ca5c6baee7ffe9f26531f1b4c77cf07e245e3 /toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
parentfa5259d44296a784c67d88197dc75d8ae860138a (diff)
downloadupstream-247e9192231dcf9db2c88173b1e76cb18abf9db5.tar.gz
upstream-247e9192231dcf9db2c88173b1e76cb18abf9db5.tar.bz2
upstream-247e9192231dcf9db2c88173b1e76cb18abf9db5.zip
autodetect ARM variant/ABI setup based on the compiler settings
SVN-Revision: 25328
Diffstat (limited to 'toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch')
-rw-r--r--toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch b/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
new file mode 100644
index 0000000000..24d5bcca66
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
@@ -0,0 +1,49 @@
+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
+