NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avr32: support uClibc 0.9.33.2

Browse Source 
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>
This commit is contained in:
Simon Dawson 2013-01-20 11:55:41 +00:00 committed by Peter Korsgaard
parent a84075b5f4
commit d7937773fd
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolchain/toolchain-buildroot/Config.in.2
View File

@ -68,7 +68,7 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
choice choice
prompt "Thread library implementation" 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 default BR2_PTHREADS_OLD
help help
Use this option to select the thread library implementation 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_UCLIBC_VERSION_0_9_31
depends on !BR2_ARM_OABI depends on !BR2_ARM_OABI
depends on !BR2_x86_i386 depends on !BR2_x86_i386
depends on !BR2_avr32
depends on !BR2_xtensa depends on !BR2_xtensa
endchoice endchoice

3
toolchain/uClibc/Config.in
View File

@ -5,7 +5,6 @@ comment "uClibc Options"
choice choice
prompt "uClibc C library Version" 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 default BR2_UCLIBC_VERSION_0_9_33
help help
Select the version of uClibc you wish to use. Select the version of uClibc you wish to use.
@ -20,7 +19,7 @@ choice
config BR2_UCLIBC_VERSION_0_9_33 config BR2_UCLIBC_VERSION_0_9_33
bool "uClibc 0.9.33.x" bool "uClibc 0.9.33.x"
depends on !(BR2_avr32 || BR2_xtensa) depends on !BR2_xtensa
config BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_VERSION_SNAPSHOT
bool "daily snapshot" bool "daily snapshot"

16
toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-140-avr32_atomic_fix.patch Normal file
View File

@ -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" \

4
toolchain/uClibc/uClibc-0.9.33.2-dup3.patch
View File

@ -29,7 +29,7 @@ new file mode 100644
index 0000000..5fdab2e index 0000000..5fdab2e
--- /dev/null --- /dev/null
+++ b/libc/sysdeps/linux/common/dup3.c +++ b/libc/sysdeps/linux/common/dup3.c
@@ -0,0 +1,15 @@ @@ -0,0 +1,17 @@
+/* vi: set sw=4 ts=4: */ +/* vi: set sw=4 ts=4: */
+/* +/*
+ * dup3() for uClibc + * dup3() for uClibc
@ -43,8 +43,10 @@ index 0000000..5fdab2e
+#include <unistd.h> +#include <unistd.h>
+ +
+ +
+#ifdef __NR_dup3
+_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) +_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
+libc_hidden_def(dup3) +libc_hidden_def(dup3)
+#endif
-- --
1.7.5.4 1.7.5.4