diff options
| author | Simon Dawson <spdawson@gmail.com> | 2013-01-20 11:55:41 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-02-02 14:45:16 +0100 |
| commit | d7937773fd85daa675290816af981ff0079f21b8 (patch) | |
| tree | 3dbbacb859fc1003d28529eece0da7782d8bed8e /toolchain | |
| parent | a84075b5f48b35c1449f17fdedc63b5c7bf6ab0c (diff) | |
| download | buildroot-novena-d7937773fd85daa675290816af981ff0079f21b8.tar.gz buildroot-novena-d7937773fd85daa675290816af981ff0079f21b8.zip | |
avr32: support uClibc 0.9.33.2
Add a uClibc patch from OpenWRT, and tweak an existing patch to cope with
the lack of a dup3 Linux syscall on avr32. This allow uClibc 0.9.33.2 to be
built for avr32.
[Peter: add upstream url for openwrt patch]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in.2 | 3 | ||||
| -rw-r--r-- | toolchain/uClibc/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch | 16 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.33.2-dup3.patch | 4 |
4 files changed, 22 insertions, 4 deletions
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index d27c9f35f..a713727f5 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -68,7 +68,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP choice prompt "Thread library implementation" - default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !BR2_xtensa + default BR2_PTHREADS_NATIVE if (!BR2_UCLIBC_VERSION_0_9_31) && !BR2_ARM_OABI && !(BR2_avr32 || BR2_xtensa) default BR2_PTHREADS_OLD help Use this option to select the thread library implementation @@ -95,6 +95,7 @@ choice depends on !BR2_UCLIBC_VERSION_0_9_31 depends on !BR2_ARM_OABI depends on !BR2_x86_i386 + depends on !BR2_avr32 depends on !BR2_xtensa endchoice diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index e47bc9bb0..a48b6a0bf 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -5,7 +5,6 @@ comment "uClibc Options" choice prompt "uClibc C library Version" - default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken default BR2_UCLIBC_VERSION_0_9_33 help Select the version of uClibc you wish to use. @@ -20,7 +19,7 @@ choice config BR2_UCLIBC_VERSION_0_9_33 bool "uClibc 0.9.33.x" - depends on !(BR2_avr32 || BR2_xtensa) + depends on !BR2_xtensa config BR2_UCLIBC_VERSION_SNAPSHOT bool "daily snapshot" diff --git a/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch b/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch new file mode 100644 index 000000000..e28b6d25d --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch @@ -0,0 +1,16 @@ +Patch from OpenWRT for avr32. + +https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch + +Signed-off-by: Simon Dawson <spdawson@gmail.com> + +--- a/libc/sysdeps/linux/avr32/bits/atomic.h ++++ b/libc/sysdeps/linux/avr32/bits/atomic.h +@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t; + + #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ + ({ \ ++ __uint32_t __result; \ + __typeof__(*(mem)) __prev; \ + __asm__ __volatile__( \ + "/* __arch_compare_and_exchange_val_32_acq */\n" \ diff --git a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch index 66b419e2b..87fe2a679 100644 --- a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch +++ b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch @@ -29,7 +29,7 @@ new file mode 100644 index 0000000..5fdab2e --- /dev/null +++ b/libc/sysdeps/linux/common/dup3.c -@@ -0,0 +1,15 @@ +@@ -0,0 +1,17 @@ +/* vi: set sw=4 ts=4: */ +/* + * dup3() for uClibc @@ -43,8 +43,10 @@ index 0000000..5fdab2e +#include <unistd.h> + + ++#ifdef __NR_dup3 +_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) +libc_hidden_def(dup3) ++#endif -- 1.7.5.4 |