From 176b8e672ce2cd3fe4897d0abd60f66a6d8070e6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 8 Feb 2012 11:13:53 -0800 Subject: [PATCH] uclibc-git: Update to latest plus future branch Signed-off-by: Khem Raj --- ...libc_arch_features.h-now-depends-on-uClib.patch | 35 +++ .../uclibc/uclibc-git/amd64-fcntl64.patch | 13 + meta/recipes-core/uclibc/uclibc-git/amd64.patch | 13 + .../uclibc/uclibc-git/arm_ioperm.patch | 13 + .../uclibc/uclibc-git/arm_remove_socketcall.patch | 62 +++++ .../uclibc-git/define-MSG_CMSG_CLOEXEC.patch | 21 ++ meta/recipes-core/uclibc/uclibc-git/dup3.patch | 33 +++ .../uclibc/uclibc-git/i386_internal_syscall.patch | 280 ++++++++++++++++++++ .../libc_symbols_include_bits_uclibc_config.patch | 19 ++ .../uclibc/uclibc-git/mount.h-update.patch | 78 ++++++ .../uclibc/uclibc-git/posix_fallocate.patch | 242 +++++++++++++++++ meta/recipes-core/uclibc/uclibc_git.bb | 40 ++-- 12 files changed, 832 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-includes-uClibc_arch_features.h-now-depends-on-uClib.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/amd64-fcntl64.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/amd64.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/arm_ioperm.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/arm_remove_socketcall.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/dup3.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/i386_internal_syscall.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/libc_symbols_include_bits_uclibc_config.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-includes-uClibc_arch_features.h-now-depends-on-uClib.patch b/meta/recipes-core/uclibc/uclibc-git/0001-includes-uClibc_arch_features.h-now-depends-on-uClib.patch new file mode 100644 index 0000000..45129f1 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/0001-includes-uClibc_arch_features.h-now-depends-on-uClib.patch @@ -0,0 +1,35 @@ +From 7ff5e8b59f629bc83f4dbaf7d76dbecccf50b122 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 7 Feb 2012 19:54:17 -0800 +Subject: [PATCH] includes: uClibc_arch_features.h now depends on + uClibc_config.h + +Adjust for the dependency so include features.h from +libc-symbols.h which is included on compiler cmdline +which otherwise misses the symbols from uClibc_config.h +since it only included bits/uClibc_arch_features.h + +So we include both bits/uClbc_configs.h and bits/uClibc_arch_features.h +in features.h and include features.h in libc-symbols.h +which then takes care of dependencies + +Signed-off-by: Khem Raj +--- + include/features.h | 1 + + include/libc-symbols.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) + +Index: git/include/libc-symbols.h +=================================================================== +--- git.orig/include/libc-symbols.h 2012-02-07 21:09:02.885347078 -0800 ++++ git/include/libc-symbols.h 2012-02-07 21:11:56.097355232 -0800 +@@ -48,6 +48,9 @@ + + */ + ++#define __need_uClibc_config_h ++# include ++#undef __need_uClibc_config_h + #include + + /* Enable declarations of GNU extensions, since we are compiling them. */ diff --git a/meta/recipes-core/uclibc/uclibc-git/amd64-fcntl64.patch b/meta/recipes-core/uclibc/uclibc-git/amd64-fcntl64.patch new file mode 100644 index 0000000..75787d8 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/amd64-fcntl64.patch @@ -0,0 +1,13 @@ +Index: git/libc/sysdeps/linux/common/__syscall_fcntl.c +=================================================================== +--- git.orig/libc/sysdeps/linux/common/__syscall_fcntl.c 2011-07-06 18:33:10.000000000 -0700 ++++ git/libc/sysdeps/linux/common/__syscall_fcntl.c 2011-07-06 18:33:29.095755801 -0700 +@@ -49,8 +49,3 @@ + } + lt_strong_alias(fcntl) + lt_libc_hidden(fcntl) +-#if defined __UCLIBC_HAS_LFS__ && (__WORDSIZE == 64 || !defined __NR_fcntl64) +-strong_alias_untyped(fcntl,fcntl64) +-lt_strong_alias(fcntl64) +-lt_libc_hidden(fcntl64) +-#endif diff --git a/meta/recipes-core/uclibc/uclibc-git/amd64.patch b/meta/recipes-core/uclibc/uclibc-git/amd64.patch new file mode 100644 index 0000000..5704134 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/amd64.patch @@ -0,0 +1,13 @@ +Index: git/libc/sysdeps/linux/common/Makefile.in +=================================================================== +--- git.orig/libc/sysdeps/linux/common/Makefile.in 2012-01-17 09:22:17.000000000 -0800 ++++ git/libc/sysdeps/linux/common/Makefile.in 2012-01-17 09:23:05.317382498 -0800 +@@ -66,7 +66,7 @@ + ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) + CSRC- += fork.c getpid.c raise.c #open.c close.c read.c write.c + CSRC- += $(if $(findstring =arm=,=$(TARGET_ARCH)=),vfork.c) +-CSRC- += $(if $(findstring =x86_64=,=$(TARGET_ARCH)=),vfork.c) ++CSRC- += $(if $(findstring =x86_64=,=$(TARGET_ARCH)=),vfork.c __socketcall.c) + #CSRC- += $(if $(findstring =mips=y=,=$(TARGET_ARCH)=$(CONFIG_MIPS_O32_ABI)=),waitpid.c) + endif + # stubbed out in mman.h diff --git a/meta/recipes-core/uclibc/uclibc-git/arm_ioperm.patch b/meta/recipes-core/uclibc/uclibc-git/arm_ioperm.patch new file mode 100644 index 0000000..bb3ad18 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/arm_ioperm.patch @@ -0,0 +1,13 @@ +Index: git/libc/sysdeps/linux/arm/ioperm.c +=================================================================== +--- git.orig/libc/sysdeps/linux/arm/ioperm.c 2011-07-05 16:52:04.000000000 -0700 ++++ git/libc/sysdeps/linux/arm/ioperm.c 2011-07-05 17:03:03.451076005 -0700 +@@ -201,8 +201,6 @@ + + return 0; + } +-libc_hidden_def(ioperm) +- + + void + outb(unsigned char b, unsigned long int port) diff --git a/meta/recipes-core/uclibc/uclibc-git/arm_remove_socketcall.patch b/meta/recipes-core/uclibc/uclibc-git/arm_remove_socketcall.patch new file mode 100644 index 0000000..555601e --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/arm_remove_socketcall.patch @@ -0,0 +1,62 @@ +Index: git/libc/sysdeps/linux/common/Makefile.in +=================================================================== +--- git.orig/libc/sysdeps/linux/common/Makefile.in 2011-07-06 01:00:01.913050422 -0700 ++++ git/libc/sysdeps/linux/common/Makefile.in 2011-07-06 01:02:36.153276645 -0700 +@@ -58,18 +58,19 @@ + CSRC- += $(if $(findstring =sh=,=$(TARGET_ARCH)=),vfork.c) + CSRC- += $(if $(findstring =sparc=,=$(TARGET_ARCH)=),vfork.c) + CSRC- += $(if $(findstring =i386=,=$(TARGET_ARCH)=),vfork.c) +- ++ifeq ($(CONFIG_ARM_EABI),y) ++CSRC- += __socketcall.c syscall.c ++endif + CSRC-y := $(filter-out $(CSRC-),$(CSRC-y)) +- +-# provided via pthreads builddir +-CSRC-y := $(filter-out $(libc_a_CSRC) $(notdir $(libpthread_libc_OBJS:.o=.c)),$(CSRC-y)) +-SSRC := $(filter-out $(libc_a_SSRC) $(notdir $(libpthread_libc_OBJS:.o=.S)),$(SSRC)) +- + # fails for some reason + ifneq ($(strip $(ARCH_OBJS)),) + CSRC-y := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)) $(ARCH_OBJ_FILTEROUT),$(CSRC-y)) + endif + ++# provided via pthreads builddir ++CSRC-y := $(filter-out $(libc_a_CSRC) $(notdir $(libpthread_libc_OBJS:.o=.c)),$(CSRC-y)) ++SSRC := $(filter-out $(libc_a_SSRC) $(notdir $(libpthread_libc_OBJS:.o=.S)),$(SSRC)) ++ + CFLAGS-ssp.c := $(SSP_DISABLE_FLAGS) + CFLAGS-ssp-local.c := $(SSP_DISABLE_FLAGS) + +Index: git/libc/sysdeps/linux/arm/Makefile.arch +=================================================================== +--- git.orig/libc/sysdeps/linux/arm/Makefile.arch 2011-07-06 01:00:01.913050422 -0700 ++++ git/libc/sysdeps/linux/arm/Makefile.arch 2011-07-06 01:00:06.633057347 -0700 +@@ -24,17 +24,11 @@ + CSRC += posix_fadvise.c + endif + +-# Is our compiler set up for EABI ? +-IS_EABI:=$(shell $(CC) $(CFLAGS) -x c - -E -dM /dev/null \ +- |sed -r -e '/^\#[[:space:]]*define[[:space:]]+__ARM_EABI__([[:space:]]+1)?$$/!d; s/.+/y/;' \ +- ) +- +-ifeq ($(IS_EABI),y) ++ifeq ($(CONFIG_ARM_EABI),y) + CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \ + aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \ + aeabi_memmove.c aeabi_memset.c find_exidx.c + SSRC += syscall-eabi.S +-ARCH_OBJ_FILTEROUT := syscall.c + ifeq ($(UCLIBC_HAS_WCHAR),y) + CSRC += aeabi_mb_cur_max.c + endif +@@ -42,7 +36,7 @@ + CSRC += syscall.c + endif + +-ifeq ($(IS_EABI),y) ++ifeq ($(CONFIG_ARM_EABI),y) + libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \ + $(ARCH_OUT)/aeabi_sighandlers.o + libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \ diff --git a/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch b/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch new file mode 100644 index 0000000..6a97614 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/define-MSG_CMSG_CLOEXEC.patch @@ -0,0 +1,21 @@ +Index: git/libc/sysdeps/linux/common/bits/socket.h +=================================================================== +--- git.orig/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:23:21.537456132 -0800 ++++ git/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:25:10.125461388 -0800 +@@ -235,8 +235,15 @@ + #define MSG_ERRQUEUE MSG_ERRQUEUE + MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */ + #define MSG_NOSIGNAL MSG_NOSIGNAL +- MSG_MORE = 0x8000 /* Sender will send more. */ ++ MSG_MORE = 0x8000, /* Sender will send more. */ + #define MSG_MORE MSG_MORE ++ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/ ++#define MSG_WAITFORONE MSG_WAITFORONE ++ ++ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file ++ descriptor received through ++ SCM_RIGHTS. */ ++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC + }; + + diff --git a/meta/recipes-core/uclibc/uclibc-git/dup3.patch b/meta/recipes-core/uclibc/uclibc-git/dup3.patch new file mode 100644 index 0000000..b319d43 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/dup3.patch @@ -0,0 +1,33 @@ +Index: git/libc/sysdeps/linux/common/dup3.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/common/dup3.c 2012-01-27 07:40:52.802900849 -0800 +@@ -0,0 +1,15 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * dup3() for uClibc ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++ ++ ++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) ++libc_hidden_def(dup3) +Index: git/include/unistd.h +=================================================================== +--- git.orig/include/unistd.h 2012-01-27 01:19:17.521792781 -0800 ++++ git/include/unistd.h 2012-01-27 07:40:03.106898447 -0800 +@@ -512,6 +512,8 @@ + /* Duplicate FD to FD2, closing FD2 and making it open on the same file. */ + extern int dup2 (int __fd, int __fd2) __THROW; + libc_hidden_proto(dup2) ++extern int dup3 (int __fd, int __fd2, int __flags) __THROW; ++libc_hidden_proto(dup3) + + /* NULL-terminated array of "NAME=VALUE" environment variables. */ + extern char **__environ; diff --git a/meta/recipes-core/uclibc/uclibc-git/i386_internal_syscall.patch b/meta/recipes-core/uclibc/uclibc-git/i386_internal_syscall.patch new file mode 100644 index 0000000..84248ec --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/i386_internal_syscall.patch @@ -0,0 +1,280 @@ +Index: git/libc/sysdeps/linux/i386/bits/syscalls.h +=================================================================== +--- git.orig/libc/sysdeps/linux/i386/bits/syscalls.h 2012-01-27 09:29:43.403216912 -0800 ++++ git/libc/sysdeps/linux/i386/bits/syscalls.h 2012-01-27 16:59:20.960522571 -0800 +@@ -14,22 +14,36 @@ + + #include + +-#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ +-({ \ +- register unsigned int resultvar; \ +- __asm__ __volatile__ ( \ ++#define INTERNAL_SYSCALL(name, err, nr, args...) \ ++({ \ ++ register unsigned int resultvar; \ ++ EXTRAVAR_##nr \ ++ __asm__ __volatile__ ( \ + LOADARGS_##nr \ + "movl %1, %%eax\n\t" \ + "int $0x80\n\t" \ + RESTOREARGS_##nr \ + : "=a" (resultvar) \ +- : "g" (name) ASMFMT_##nr(args) : "memory", "cc" \ +- ); \ +- (int) resultvar; \ ++ : "i" (__NR_##name) ASMFMT_##nr(args) \ ++ : "memory", "cc" \ ++ ); \ ++ (int) resultvar; \ + }) + +- +-#if 1 /* defined __PIC__ || defined __pic__ */ ++#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ ++({ \ ++ register unsigned int resultvar; \ ++ EXTRAVAR_##nr \ ++ __asm__ __volatile__ ( \ ++ LOADARGS_##nr \ ++ "int $0x80\n\t" \ ++ RESTOREARGS_##nr \ ++ : "=a" (resultvar) \ ++ : "g" (name) ASMFMT_##nr(args) \ ++ : "memory", "cc" \ ++ ); \ ++ (int) resultvar; \ ++}) + + /* This code avoids pushing/popping ebx as much as possible. + * I think the main reason was that older GCCs had problems +@@ -137,56 +151,12 @@ + #define ASMFMT_6(arg1, arg2, arg3, arg4, arg5, arg6) \ + , "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "m" (arg6) + +-#else /* !PIC */ +- +-/* Simpler code which just uses "b" constraint to load ebx. +- * Seems to work with gc 4.2.x, and generates slightly smaller, +- * but slightly slower code. Example (time syscall): +- * +- * - 8b 4c 24 04 mov 0x4(%esp),%ecx +- * - 87 cb xchg %ecx,%ebx +- * + 53 push %ebx +- * + 8b 5c 24 08 mov 0x8(%esp),%ebx +- * b8 0d 00 00 00 mov $0xd,%eax +- * cd 80 int $0x80 +- * - 87 cb xchg %ecx,%ebx +- * + 5b pop %ebx +- * c3 ret +- * +- * 2 bytes smaller, but uses stack via "push/pop ebx" +- */ +- +-#define LOADARGS_0 +-#define LOADARGS_1 +-#define LOADARGS_2 +-#define LOADARGS_3 +-#define LOADARGS_4 +-#define LOADARGS_5 +-#define LOADARGS_6 "push %%ebp\n\t" "movl %7, %%ebp\n\t" +- +-#define RESTOREARGS_0 +-#define RESTOREARGS_1 +-#define RESTOREARGS_2 +-#define RESTOREARGS_3 +-#define RESTOREARGS_4 +-#define RESTOREARGS_5 +-#define RESTOREARGS_6 "pop %%ebp\n\t" +- +-#define ASMFMT_0() +-#define ASMFMT_1(arg1) \ +- , "b" (arg1) +-#define ASMFMT_2(arg1, arg2) \ +- , "b" (arg1), "c" (arg2) +-#define ASMFMT_3(arg1, arg2, arg3) \ +- , "b" (arg1), "c" (arg2), "d" (arg3) +-#define ASMFMT_4(arg1, arg2, arg3, arg4) \ +- , "b" (arg1), "c" (arg2), "d" (arg3), "S" (arg4) +-#define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \ +- , "b" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5) +-#define ASMFMT_6(arg1, arg2, arg3, arg4, arg5, arg6) \ +- , "b" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "m" (arg6) +- +-#endif /* !PIC */ +- ++#define EXTRAVAR_0 ++#define EXTRAVAR_1 ++#define EXTRAVAR_2 ++#define EXTRAVAR_3 ++#define EXTRAVAR_4 ++#define EXTRAVAR_5 int _xv; ++#define EXTRAVAR_6 + #endif /* __ASSEMBLER__ */ + #endif /* _BITS_SYSCALLS_H */ +Index: git/libc/sysdeps/linux/common/bits/syscalls-common.h +=================================================================== +--- git.orig/libc/sysdeps/linux/common/bits/syscalls-common.h 2012-01-27 10:04:58.555319277 -0800 ++++ git/libc/sysdeps/linux/common/bits/syscalls-common.h 2012-01-27 11:56:31.771643212 -0800 +@@ -30,13 +30,27 @@ + #endif + + /* Define a macro which expands into the inline wrapper code for a system call */ +-#ifndef INLINE_SYSCALL +-# define INLINE_SYSCALL(name, nr, args...) INLINE_SYSCALL_NCS(__NR_##name, nr, args) +-#endif + #ifndef INLINE_SYSCALL_NOERR +-# define INLINE_SYSCALL_NOERR(name, nr, args...) INLINE_SYSCALL_NOERR_NCS(__NR_##name, nr, args) ++# define INLINE_SYSCALL_NOERR(name, nr, args...) \ ++({ \ ++ INTERNAL_SYSCALL_DECL(__err); \ ++ long __res = INTERNAL_SYSCALL(name, __err, nr, args); \ ++ __res; \ ++}) + #endif + ++#ifndef INLINE_SYSCALL ++# define INLINE_SYSCALL(name, nr, args...) \ ++({ \ ++ INTERNAL_SYSCALL_DECL(__err); \ ++ long __res = INTERNAL_SYSCALL(name, __err, nr, args); \ ++ if (unlikely(INTERNAL_SYSCALL_ERROR_P(__res, __err))) { \ ++ __set_errno(INTERNAL_SYSCALL_ERRNO(__res, __err)); \ ++ __res = -1L; \ ++ } \ ++ __res; \ ++}) ++#endif + /* Just like INLINE_SYSCALL(), but take a non-constant syscall (NCS) argument */ + #ifndef INLINE_SYSCALL_NCS + # define INLINE_SYSCALL_NCS(name, nr, args...) \ +Index: git/libc/sysdeps/linux/i386/posix_fallocate.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/i386/posix_fallocate.c 2012-01-27 15:44:11.476304303 -0800 +@@ -0,0 +1,38 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate() for uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++#include ++ ++#ifndef __USE_FILE_OFFSET64 ++ ++#ifdef __NR_fallocate ++int posix_fallocate(int fd, __off_t offset, __off_t len) ++{ ++ if (len != (off_t) len) ++ return EOVERFLOW; ++ int res = __call_fallocate (fd, 0, offset, len); ++ if (res != EOPNOTSUPP) ++ return res; ++ if (! res) ++ return 0; ++ else ++ return -1; ++} ++ ++#elif defined __UCLIBC_HAS_STUBS__ ++int posix_fallocate(int fd attribute_unused, off_t offset attribute_unused, off_t len attribute_unused) ++{ ++ return ENOSYS; ++} ++#endif ++ ++#endif /* !__USE_FILE_OFFSET64 */ +Index: git/libc/sysdeps/linux/i386/posix_fallocate64.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/i386/posix_fallocate64.c 2012-01-27 15:43:29.176302256 -0800 +@@ -0,0 +1,46 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate64() for uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern int __call_fallocate (int fd, int mode, __off64_t offset, __off64_t len) ++ attribute_hidden; ++ ++#ifdef __UCLIBC_HAS_LFS__ ++ ++#ifdef __NR_fallocate ++int posix_fallocate64(int fd, __off64_t offset, __off64_t len) ++{ ++ if (len != (off_t) len) ++ return EOVERFLOW; ++ int res = __call_fallocate (fd, 0, offset, len); ++ if (res != EOPNOTSUPP) ++ return res; ++ if (! res) ++ return 0; ++ else ++ return -1; ++} ++ ++#elif defined __UCLIBC_HAS_STUBS__ ++int posix_fallocate64(int fd attribute_unused, off64_t offset attribute_unused, off64_t len attribute_unused) ++{ ++ return ENOSYS; ++} ++#endif /* __NR_fallocate */ ++ ++#endif /* __UCLIBC_HAS_LFS__ */ +Index: git/libc/sysdeps/linux/i386/Makefile.arch +=================================================================== +--- git.orig/libc/sysdeps/linux/i386/Makefile.arch 2012-01-27 10:19:12.403360603 -0800 ++++ git/libc/sysdeps/linux/i386/Makefile.arch 2012-01-27 15:33:16.920272625 -0800 +@@ -5,7 +5,7 @@ + # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + # + +-CSRC := brk.c __syscall_error.c ++CSRC := brk.c __syscall_error.c posix_fallocate.c posix_fallocate64.c + + ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y) + CSRC += sigaction.c +@@ -13,8 +13,8 @@ + + SSRC := \ + __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ +- sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S +- ++ sync_file_range.S syscall.S mmap.S mmap64.S posix_fadvise64.S \ ++ call_fallocate.S + + ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y) + SSRC += vfork.S clone.S +Index: git/libc/sysdeps/linux/i386/call_fallocate.S +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/i386/call_fallocate.S 2012-01-27 15:32:48.736271260 -0800 +@@ -0,0 +1,7 @@ ++#include ++ ++#ifdef __NR_fallocate ++PSEUDO_ERRVAL (__call_fallocate, fallocate, 6) ++ ret_ERRVAL ++PSEUDO_END_ERRVAL(__call_fallocate) ++#endif diff --git a/meta/recipes-core/uclibc/uclibc-git/libc_symbols_include_bits_uclibc_config.patch b/meta/recipes-core/uclibc/uclibc-git/libc_symbols_include_bits_uclibc_config.patch new file mode 100644 index 0000000..8064115 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/libc_symbols_include_bits_uclibc_config.patch @@ -0,0 +1,19 @@ +Index: git/include/libc-symbols.h +=================================================================== +--- git.orig/include/libc-symbols.h 2011-07-05 17:04:41.171219323 -0700 ++++ git/include/libc-symbols.h 2011-07-05 22:50:36.851661478 -0700 +@@ -48,10 +48,12 @@ + + */ + +-#include +- + /* Enable declarations of GNU extensions, since we are compiling them. */ + #define _GNU_SOURCE 1 ++#define __need_uClibc_config_h ++#include ++#undef __need_uClibc_config_h ++#include + + /* Prepare for the case that `__builtin_expect' is not available. */ + #if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ < 96 diff --git a/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch new file mode 100644 index 0000000..ee1c6a2 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/mount.h-update.patch @@ -0,0 +1,78 @@ +Index: git/include/sys/mount.h +=================================================================== +--- git.orig/include/sys/mount.h 2011-07-21 14:37:27.134255747 -0700 ++++ git/include/sys/mount.h 2011-07-21 14:39:53.844470932 -0700 +@@ -1,5 +1,5 @@ + /* Header file for mounting/unmount Linux filesystems. +- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc. ++ Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -47,23 +47,46 @@ + #define MS_REMOUNT MS_REMOUNT + MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */ + #define MS_MANDLOCK MS_MANDLOCK +- S_WRITE = 128, /* Write on file/directory/symlink. */ +-#define S_WRITE S_WRITE +- S_APPEND = 256, /* Append-only file. */ +-#define S_APPEND S_APPEND +- S_IMMUTABLE = 512, /* Immutable file. */ +-#define S_IMMUTABLE S_IMMUTABLE ++ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */ ++#define MS_DIRSYNC MS_DIRSYNC + MS_NOATIME = 1024, /* Do not update access times. */ + #define MS_NOATIME MS_NOATIME + MS_NODIRATIME = 2048, /* Do not update directory access times. */ + #define MS_NODIRATIME MS_NODIRATIME + MS_BIND = 4096, /* Bind directory at different place. */ + #define MS_BIND MS_BIND ++ MS_MOVE = 8192, ++#define MS_MOVE MS_MOVE ++ MS_REC = 16384, ++#define MS_REC MS_REC ++ MS_SILENT = 32768, ++#define MS_SILENT MS_SILENT ++ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */ ++#define MS_POSIXACL MS_POSIXACL ++ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */ ++#define MS_UNBINDABLE MS_UNBINDABLE ++ MS_PRIVATE = 1 << 18, /* Change to private. */ ++#define MS_PRIVATE MS_PRIVATE ++ MS_SLAVE = 1 << 19, /* Change to slave. */ ++#define MS_SLAVE MS_SLAVE ++ MS_SHARED = 1 << 20, /* Change to shared. */ ++#define MS_SHARED MS_SHARED ++ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */ ++#define MS_RELATIME MS_RELATIME ++ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */ ++#define MS_KERNMOUNT MS_KERNMOUNT ++ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */ ++#define MS_I_VERSION MS_I_VERSION ++ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */ ++#define MS_STRICTATIME MS_STRICTATIME ++ MS_ACTIVE = 1 << 30, ++#define MS_ACTIVE MS_ACTIVE ++ MS_NOUSER = 1 << 31 ++#define MS_NOUSER MS_NOUSER + }; + + /* Flags that can be altered by MS_REMOUNT */ +-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \ +- |MS_NODIRATIME) ++#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION) + + + /* Magic mount flag number. Has to be or-ed to the flag values. */ +@@ -100,8 +123,10 @@ + #define MNT_FORCE MNT_FORCE + MNT_DETACH = 2, /* Just detach from the tree. */ + #define MNT_DETACH MNT_DETACH +- MNT_EXPIRE = 4 /* Mark for expiry. */ ++ MNT_EXPIRE = 4, /* Mark for expiry. */ + #define MNT_EXPIRE MNT_EXPIRE ++ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */ ++#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW + }; + + diff --git a/meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch b/meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch new file mode 100644 index 0000000..4b7ade7 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch @@ -0,0 +1,242 @@ +Add posix_fallocate / posix_fallocate64 support (EXPERIMENTAL) + + MIPS platform only, for now. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +--- + include/fcntl.h | 4 -- + libc/sysdeps/linux/common/Makefile.in | 3 + + libc/sysdeps/linux/common/posix_fallocate.c | 35 ++++++++++++++++++++ + libc/sysdeps/linux/common/posix_fallocate64.c | 45 ++++++++++++++++++++++++++ + libc/sysdeps/linux/mips/Makefile.arch | 2 - + libc/sysdeps/linux/mips/posix_fallocate.c | 37 +++++++++++++++++++++ + libc/sysdeps/linux/mips/posix_fallocate64.c | 41 +++++++++++++++++++++++ + 7 files changed, 162 insertions(+), 5 deletions(-) + +Index: git/include/fcntl.h +=================================================================== +--- git.orig/include/fcntl.h 2012-01-27 20:46:19.801181663 -0800 ++++ git/include/fcntl.h 2012-01-27 20:46:22.141181776 -0800 +@@ -210,9 +210,7 @@ + + #endif + +-#if 0 /* && defined __UCLIBC_HAS_ADVANCED_REALTIME__ */ +- +-/* FIXME -- uClibc should probably implement these... */ ++#if defined __UCLIBC_HAS_ADVANCED_REALTIME__ + + /* Reserve storage for the data of the file associated with FD. + +Index: git/libc/sysdeps/linux/common/Makefile.in +=================================================================== +--- git.orig/libc/sysdeps/linux/common/Makefile.in 2012-01-27 20:46:19.933181669 -0800 ++++ git/libc/sysdeps/linux/common/Makefile.in 2012-01-27 20:46:22.141181776 -0800 +@@ -81,7 +81,8 @@ + sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \ + sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c + # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_typed_mem_get_info|pthread_mutex_timedlock|sem_timedwait +-CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c ++CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c \ ++ posix_fallocate.c posix_fallocate64.c + CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c + CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c + CSRC-$(UCLIBC_HAS_XATTR) += xattr.c +Index: git/libc/sysdeps/linux/common/posix_fallocate64.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/common/posix_fallocate64.c 2012-01-27 20:56:54.301212000 -0800 +@@ -0,0 +1,47 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate64() for uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef __UCLIBC_HAS_LFS__ ++ ++#ifdef __NR_fallocate ++int posix_fallocate64(int fd, __off64_t offset, __off64_t len) ++{ ++ if (len != (off_t) len) ++ return EOVERFLOW; ++ long int len1 = (long int)len >> 32; ++ long int offset1 = (long int)offset >> 32; ++ INTERNAL_SYSCALL_DECL (err); ++ int ret = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, ++ __LONG_LONG_PAIR (offset1, ++ (long int) offset), ++ __LONG_LONG_PAIR (len1, ++ (long int) len)); ++ if (!INTERNAL_SYSCALL_ERROR_P (ret, err)) ++ return 0; ++ return INTERNAL_SYSCALL_ERRNO (ret, err); ++} ++ ++#elif defined __UCLIBC_HAS_STUBS__ ++int posix_fallocate64(int fd attribute_unused, off64_t offset attribute_unused, off64_t len attribute_unused) ++{ ++ return ENOSYS; ++} ++#endif /* __NR_fallocate */ ++ ++#endif /* __UCLIBC_HAS_LFS__ */ +Index: git/libc/sysdeps/linux/common/posix_fallocate.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/common/posix_fallocate.c 2012-01-27 20:46:22.141181776 -0800 +@@ -0,0 +1,37 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate() for uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++ ++#ifndef __USE_FILE_OFFSET64 ++ ++#ifdef __NR_fallocate ++int posix_fallocate(int fd, off_t offset, off_t len) ++{ ++ off_t len1 = len >> 31; ++ off_t offset1 = offset >> 31; ++ INTERNAL_SYSCALL_DECL(err); ++ int ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0, ++ __LONG_LONG_PAIR (offset1, offset), ++ __LONG_LONG_PAIR (len1, len))); ++ if (INTERNAL_SYSCALL_ERROR_P (ret, err)) ++ return INTERNAL_SYSCALL_ERRNO (ret, err); ++ return 0; ++} ++ ++#elif defined __UCLIBC_HAS_STUBS__ ++int posix_fallocate(int fd attribute_unused, off_t offset attribute_unused, off_t len attribute_unused) ++{ ++ return ENOSYS; ++} ++#endif ++ ++#endif /* !__USE_FILE_OFFSET64 */ +Index: git/libc/sysdeps/linux/mips/Makefile.arch +=================================================================== +--- git.orig/libc/sysdeps/linux/mips/Makefile.arch 2012-01-27 20:46:19.981181671 -0800 ++++ git/libc/sysdeps/linux/mips/Makefile.arch 2012-01-27 20:46:22.141181776 -0800 +@@ -13,7 +13,7 @@ + SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S syscall.S pipe.S syscall_error.S + + ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y) +-CSRC += posix_fadvise.c posix_fadvise64.c ++CSRC += posix_fadvise.c posix_fadvise64.c posix_fallocate.c posix_fallocate64.c + endif + + ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y) +Index: git/libc/sysdeps/linux/mips/posix_fallocate64.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/mips/posix_fallocate64.c 2012-01-27 20:46:22.141181776 -0800 +@@ -0,0 +1,41 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate64() for MIPS uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef __UCLIBC_HAS_LFS__ ++ ++int posix_fallocate64(int fd, __off64_t offset, __off64_t len) ++{ ++#ifdef __NR_fallocate ++ INTERNAL_SYSCALL_DECL(err); ++# if _MIPS_SIM == _MIPS_SIM_ABI32 ++ int ret = INTERNAL_SYSCALL(fallocate, err, 6, fd, 0, ++ __LONG_LONG_PAIR ((long) (offset >> 32), (long) offset), ++ __LONG_LONG_PAIR ((long) (len >> 32), (long) len)); ++# else /* N32 || N64 */ ++ int ret = INTERNAL_SYSCALL(fallocate, err, 4, fd, 0, offset, len); ++# endif ++ if (INTERNAL_SYSCALL_ERROR_P (ret, err)) ++ return INTERNAL_SYSCALL_ERRNO (ret, err); ++ return 0; ++#else ++ return ENOSYS; ++#endif ++} ++ ++#endif /* __UCLIBC_HAS_LFS__ */ +Index: git/libc/sysdeps/linux/mips/posix_fallocate.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ git/libc/sysdeps/linux/mips/posix_fallocate.c 2012-01-27 20:46:22.145181776 -0800 +@@ -0,0 +1,37 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * posix_fallocate() for MIPS uClibc ++ * http://www.opengroup.org/onlinepubs/009695399/functions/posix_fallocate.html ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int posix_fallocate(int fd, off_t offset, off_t len) ++{ ++#ifdef __NR_fallocate ++ INTERNAL_SYSCALL_DECL(err); ++# if _MIPS_SIM == _ABIO32 ++ int ret = INTERNAL_SYSCALL(fallocate, err, 6, fd, 0, ++ __LONG_LONG_PAIR ((long) (offset >> 31), (long) offset), ++ __LONG_LONG_PAIR ((long) (len >> 31), (long) len)); ++# else /* N32 || N64 */ ++ int ret = INTERNAL_SYSCALL(fallocate, err, 4, fd, offset, len); ++# endif ++ if (INTERNAL_SYSCALL_ERROR_P (ret, err)) ++ return INTERNAL_SYSCALL_ERRNO (ret, err); ++ return 0; ++#else ++ return ENOSYS; ++#endif ++} diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb index 0088152..ce566ba 100644 --- a/meta/recipes-core/uclibc/uclibc_git.bb +++ b/meta/recipes-core/uclibc/uclibc_git.bb @@ -1,28 +1,34 @@ -SRCREV="eb72efd81e0d5be6c836c5a084cc65b9734f544d" +SRCREV="747d9718112b3b980dfeea70c5376c380707c0c7" require uclibc.inc # We prefer a release version so DP -1 for this DEFAULT_PREFERENCE = "-1" - -PV = "0.9.32+0.9.33-rc0" -PR = "${INC_PR}.1" +PV = "0.9.33+gitr${SRCREV}" +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" -SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ - file://uClibc.machine \ - file://uClibc.distro \ - file://uclibc_enable_log2_test.patch \ - file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \ - file://powerpc_copysignl.patch \ - file://argp-support.patch \ - file://argp-headers.patch \ - file://remove_attribute_optimize_Os.patch \ - file://compile-arm-fork-with-O2.patch \ - file://uclibc-execvpe.patch \ - file://orign_path.patch \ - " +SRC_URI = "git://github.com/kraj/uClibc.git;branch=master;protocol=git \ + file://uClibc.machine \ + file://uClibc.distro \ + file://uclibc_enable_log2_test.patch \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \ + file://powerpc_copysignl.patch \ + file://argp-support.patch \ + file://argp-headers.patch \ + file://remove_attribute_optimize_Os.patch \ + file://compile-arm-fork-with-O2.patch \ + file://uclibc-execvpe.patch \ + file://dup3.patch \ + file://define-MSG_CMSG_CLOEXEC.patch \ + file://amd64-fcntl64.patch \ + file://amd64.patch \ + file://arm_ioperm.patch \ + file://arm_remove_socketcall.patch \ + file://mount.h-update.patch \ + file://0001-includes-uClibc_arch_features.h-now-depends-on-uClib.patch \ + " S = "${WORKDIR}/git" -- 1.7.5.4