diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-06-26 14:01:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-02 22:23:49 +0100 |
commit | 0188270f8cce65c4fb5937e0688c0ff70b0f2142 (patch) | |
tree | e7c29a1561070098485d9a628503a0634a20de96 /meta/recipes-core/uclibc/uclibc-git | |
parent | c0d232875fe85d97700e7a7e44e52574a29784cd (diff) | |
download | poky-0188270f8cce65c4fb5937e0688c0ff70b0f2142.tar.gz |
uclibc: Update to latest git/master version
Use kernel cfg management infra to manage kconfig
fragments.
Add fragments for locale and obstrack and enable them
by default
Drop aplready applied patches
Drop DP = -1
(From OE-Core rev: 7bcf53ddb2e1a7171545f544ee2443b06d7c3359)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc/uclibc-git')
6 files changed, 81 insertions, 81 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch b/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch new file mode 100644 index 0000000000..7c17a19420 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-add-posix_fadvise-for-arm.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From 236a65abe0a6810e20498fc0ba8d02d90978953b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 29 Jun 2013 22:46:53 -0700 | ||
4 | Subject: [PATCH] add posix_fadvise() for arm | ||
5 | |||
6 | arm call to posix_fadvise simply calls posix_fadvise64 | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | libc/sysdeps/linux/common/posix_fadvise.c | 24 ++++++++++++++++-------- | ||
11 | 1 file changed, 16 insertions(+), 8 deletions(-) | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | diff --git a/libc/sysdeps/linux/common/posix_fadvise.c b/libc/sysdeps/linux/common/posix_fadvise.c | ||
16 | index d3e1bd4..e102ce7 100644 | ||
17 | --- a/libc/sysdeps/linux/common/posix_fadvise.c | ||
18 | +++ b/libc/sysdeps/linux/common/posix_fadvise.c | ||
19 | @@ -10,30 +10,38 @@ | ||
20 | |||
21 | #include <sys/syscall.h> | ||
22 | |||
23 | -#ifdef __NR_fadvise64 | ||
24 | +#if defined(__NR_fadvise64) || defined(__NR_arm_fadvise64_64) | ||
25 | # include <fcntl.h> | ||
26 | # include <endian.h> | ||
27 | # include <bits/wordsize.h> | ||
28 | |||
29 | +# ifdef __NR_arm_fadvise64_64 | ||
30 | +int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice); | ||
31 | +# endif | ||
32 | + | ||
33 | int posix_fadvise(int fd, off_t offset, off_t len, int advice) | ||
34 | { | ||
35 | +# ifdef __NR_arm_fadvise64_64 | ||
36 | + return posix_fadvise64(fd, offset, len, advice); | ||
37 | +# else | ||
38 | int ret; | ||
39 | INTERNAL_SYSCALL_DECL(err); | ||
40 | -# if __WORDSIZE == 64 | ||
41 | +# if __WORDSIZE == 64 | ||
42 | ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice); | ||
43 | -# else | ||
44 | -# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) | ||
45 | - ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0, | ||
46 | # else | ||
47 | +# if defined(__UCLIBC_SYSCALL_ALIGN_64BIT__) | ||
48 | + ret = INTERNAL_SYSCALL(fadvise64, err, 6, fd, /*unused*/0, | ||
49 | +# else | ||
50 | ret = INTERNAL_SYSCALL(fadvise64, err, 5, fd, | ||
51 | -# endif | ||
52 | +# endif | ||
53 | OFF_HI_LO (offset), len, advice); | ||
54 | -# endif | ||
55 | +# endif | ||
56 | if (INTERNAL_SYSCALL_ERROR_P (ret, err)) | ||
57 | return INTERNAL_SYSCALL_ERRNO (ret, err); | ||
58 | return 0; | ||
59 | +# endif | ||
60 | } | ||
61 | -# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_fadvise64_64 || __WORDSIZE == 64) | ||
62 | +# if defined __UCLIBC_HAS_LFS__ && ((!defined __NR_fadvise64_64 && !defined __NR_arm_fadvise64_64) || __WORDSIZE == 64) | ||
63 | strong_alias(posix_fadvise,posix_fadvise64) | ||
64 | # endif | ||
65 | #endif | ||
66 | -- | ||
67 | 1.7.9.5 | ||
68 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch b/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch deleted file mode 100644 index 8512c456a5..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | -Khem | ||
4 | |||
5 | From e20fd2c2427be981c16cb936cc6866d08520de9b Mon Sep 17 00:00:00 2001 | ||
6 | From: Khem Raj <raj.khem@gmail.com> | ||
7 | Date: Mon, 25 Mar 2013 19:34:39 -0700 | ||
8 | Subject: [PATCH] i386/sysdep.h: Remove STABS_* macros | ||
9 | |||
10 | uclibc is compiled with elf/dwarf and secondly HAVE_CPP_ASM_DEBUGINFO | ||
11 | is not defined so we generate bogus .stab sections needlessly | ||
12 | |||
13 | Some of post processing tools get confused when they see both | ||
14 | dwarf and stab sections | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | libc/sysdeps/linux/i386/sysdep.h | 27 --------------------------- | ||
19 | 1 file changed, 27 deletions(-) | ||
20 | |||
21 | diff --git a/libc/sysdeps/linux/i386/sysdep.h b/libc/sysdeps/linux/i386/sysdep.h | ||
22 | index 983c4f5..7a8d2e2 100644 | ||
23 | --- a/libc/sysdeps/linux/i386/sysdep.h | ||
24 | +++ b/libc/sysdeps/linux/i386/sysdep.h | ||
25 | @@ -43,12 +43,9 @@ | ||
26 | incomplete stabs information. Fake some entries here which specify | ||
27 | the current source file. */ | ||
28 | #define ENTRY(name) \ | ||
29 | - STABS_CURRENT_FILE1("") \ | ||
30 | - STABS_CURRENT_FILE(name) \ | ||
31 | ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \ | ||
32 | ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function) \ | ||
33 | .align ALIGNARG(4); \ | ||
34 | - STABS_FUN(name) \ | ||
35 | C_LABEL(name) \ | ||
36 | cfi_startproc; \ | ||
37 | CALL_MCOUNT | ||
38 | @@ -57,30 +54,6 @@ | ||
39 | #define END(name) \ | ||
40 | cfi_endproc; \ | ||
41 | ASM_SIZE_DIRECTIVE(name) \ | ||
42 | - STABS_FUN_END(name) | ||
43 | - | ||
44 | -#ifdef HAVE_CPP_ASM_DEBUGINFO | ||
45 | -/* Disable that goop, because we just pass -g through to the assembler | ||
46 | - and it generates proper line number information directly. */ | ||
47 | -# define STABS_CURRENT_FILE1(name) | ||
48 | -# define STABS_CURRENT_FILE(name) | ||
49 | -# define STABS_FUN(name) | ||
50 | -# define STABS_FUN_END(name) | ||
51 | -#else | ||
52 | -/* Remove the following two lines once the gdb bug is fixed. */ | ||
53 | -#define STABS_CURRENT_FILE(name) \ | ||
54 | - STABS_CURRENT_FILE1 (#name) | ||
55 | -#define STABS_CURRENT_FILE1(name) \ | ||
56 | - 1: .stabs name,100,0,0,1b; | ||
57 | -/* Emit stabs definition lines. We use F(0,1) and define t(0,1) as `int', | ||
58 | - the same way gcc does it. */ | ||
59 | -#define STABS_FUN(name) STABS_FUN2(name, name##:F(0,1)) | ||
60 | -#define STABS_FUN2(name, namestr) \ | ||
61 | - .stabs "int:t(0,1)=r(0,1);-2147483648;2147483647;",128,0,0,0; \ | ||
62 | - .stabs #namestr,36,0,0,name; | ||
63 | -#define STABS_FUN_END(name) \ | ||
64 | - 1: .stabs "",36,0,0,1b-name; | ||
65 | -#endif | ||
66 | |||
67 | /* If compiled for profiling, call `mcount' at the start of each function. */ | ||
68 | #ifdef PROF | ||
69 | -- | ||
70 | 1.7.9.5 | ||
71 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch index 7fc5bd3d74..7e7c5793f1 100644 --- a/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch +++ b/meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch | |||
@@ -13,9 +13,9 @@ Upstream-Status: Pending | |||
13 | 13 | ||
14 | Index: git/libc/sysdeps/linux/arm/Makefile.arch | 14 | Index: git/libc/sysdeps/linux/arm/Makefile.arch |
15 | =================================================================== | 15 | =================================================================== |
16 | --- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2013-03-25 19:48:48.000000000 -0700 | 16 | --- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2013-05-23 11:13:32.000000000 -0700 |
17 | +++ git/libc/sysdeps/linux/arm/Makefile.arch 2013-03-25 19:51:57.496677771 -0700 | 17 | +++ git/libc/sysdeps/linux/arm/Makefile.arch 2013-05-23 11:16:18.304333131 -0700 |
18 | @@ -13,7 +13,10 @@ | 18 | @@ -13,7 +13,9 @@ |
19 | vfork.S clone.S | 19 | vfork.S clone.S |
20 | 20 | ||
21 | SSRC-$(UCLIBC_HAS_LFS) += mmap64.S | 21 | SSRC-$(UCLIBC_HAS_LFS) += mmap64.S |
@@ -23,7 +23,6 @@ Index: git/libc/sysdeps/linux/arm/Makefile.arch | |||
23 | +SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S | 23 | +SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S |
24 | +libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os | 24 | +libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os |
25 | +libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o | 25 | +libc-static-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.o |
26 | + | ||
27 | CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise.c | ||
28 | CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c | 26 | CSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += makecontext.c |
29 | SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S | 27 | SSRC-$(UCLIBC_HAS_CONTEXT_FUNCS) += getcontext.S setcontext.S swapcontext.S |
28 | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/locale.cfg b/meta/recipes-core/uclibc/uclibc-git/locale.cfg new file mode 100644 index 0000000000..fc66435163 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/locale.cfg | |||
@@ -0,0 +1,3 @@ | |||
1 | UCLIBC_HAS_LOCALE=y | ||
2 | UCLIBC_HAS_XLOCALE=y | ||
3 | UCLIBC_BUILD_MINIMAL_LOCALE=y | ||
diff --git a/meta/recipes-core/uclibc/uclibc-git/obstack.cfg b/meta/recipes-core/uclibc/uclibc-git/obstack.cfg new file mode 100644 index 0000000000..36bf9d6e4a --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/obstack.cfg | |||
@@ -0,0 +1 @@ | |||
UCLIBC_HAS_OBSTACK=y | |||
diff --git a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch index ce58583c81..2f014cd91e 100644 --- a/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch +++ b/meta/recipes-core/uclibc/uclibc-git/powerpc_copysignl.patch | |||
@@ -6,21 +6,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
6 | 6 | ||
7 | Index: git/libc/sysdeps/linux/powerpc/Makefile.arch | 7 | Index: git/libc/sysdeps/linux/powerpc/Makefile.arch |
8 | =================================================================== | 8 | =================================================================== |
9 | --- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:18:22.000000000 -0800 | 9 | --- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch 2013-05-23 11:09:50.000000000 -0700 |
10 | +++ git/libc/sysdeps/linux/powerpc/Makefile.arch 2013-01-21 16:21:25.363552429 -0800 | 10 | +++ git/libc/sysdeps/linux/powerpc/Makefile.arch 2013-05-23 11:12:06.072328399 -0700 |
11 | @@ -5,7 +5,7 @@ | 11 | @@ -5,7 +5,7 @@ |
12 | # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. | 12 | # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. |
13 | # | 13 | # |
14 | 14 | ||
15 | -CSRC-y := __syscall_error.c pread_write.c ioctl.c | 15 | -CSRC-y := __syscall_error.c ioctl.c |
16 | +CSRC-y := __syscall_error.c pread_write.c ioctl.c copysignl.c | 16 | +CSRC-y := __syscall_error.c ioctl.c copysignl.c |
17 | 17 | ||
18 | SSRC-y := \ | 18 | SSRC-y := \ |
19 | __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ | 19 | __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ |
20 | Index: git/libc/sysdeps/linux/powerpc/copysignl.c | 20 | Index: git/libc/sysdeps/linux/powerpc/copysignl.c |
21 | =================================================================== | 21 | =================================================================== |
22 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 22 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 |
23 | +++ git/libc/sysdeps/linux/powerpc/copysignl.c 2013-01-21 16:20:46.807552554 -0800 | 23 | +++ git/libc/sysdeps/linux/powerpc/copysignl.c 2013-05-23 11:11:37.600327865 -0700 |
24 | @@ -0,0 +1,89 @@ | 24 | @@ -0,0 +1,89 @@ |
25 | +/* s_copysignl.c -- long double version of s_copysign.c. | 25 | +/* s_copysignl.c -- long double version of s_copysign.c. |
26 | + * Conversion to long double by Ulrich Drepper, | 26 | + * Conversion to long double by Ulrich Drepper, |