From patchwork Wed Apr 11 21:41:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 151896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id EB63EB6FF7 for ; Thu, 12 Apr 2012 07:41:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EF1B5A02FF; Wed, 11 Apr 2012 21:41:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YimDC2LDNTjl; Wed, 11 Apr 2012 21:41:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 65237A01ED; Wed, 11 Apr 2012 21:41:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 50D438F753 for ; Wed, 11 Apr 2012 21:41:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3810A8CEB9 for ; Wed, 11 Apr 2012 21:41:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id snNvlCtS8+ME for ; Wed, 11 Apr 2012 21:41:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id D97598CE6A for ; Wed, 11 Apr 2012 21:41:13 +0000 (UTC) Received: from asgard (host9.190-138-181.telecom.net.ar [190.138.181.9]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q3BLf7Og018753 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 11 Apr 2012 18:41:09 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1334180471; bh=XJrcAI28vSseXjDyjQkkWs1+bKn8GPUVe8+146uLi0w=; h=From:To:Cc:Subject:Date:Message-Id; b=jnv+Au8Nk4Am6pgWrhIS/DoKmAnDO/Ivjm05Q7+dMTaCjkuCetE7K6SgpfUGfFZsu t/w5ngEAm0ALCvlew0qLLTz8ZNN/pvo2W9db86zo4SdRxKO3QeQhi9BD7YxxHLuZcg Msh1aaZE+3qpzlXkM0YYpybgHQi6+oj567l1eL5U= Received: by asgard (sSMTP sendmail emulation); Wed, 11 Apr 2012 18:41:06 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 11 Apr 2012 18:41:06 -0300 Message-Id: <1334180466-11270-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] toolchain/uClibc: bump 0.9.33.x series to version 0.9.33.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Gustavo Zacarias --- toolchain/uClibc/Config.in | 2 +- ...__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch | 30 ---- ...t-stat-fstat-Use-64bit-version-of-syscall.patch | 179 -------------------- ... uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch} | 0 ....9.33-dup3.patch => uClibc-0.9.33.1-dup3.patch} | 0 ...33.1-mmap64-include-stdint.h-for-uint64_t.patch | 28 +++ 6 files changed, 29 insertions(+), 210 deletions(-) delete mode 100644 toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch delete mode 100644 toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch rename toolchain/uClibc/{uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch => uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch} (100%) rename toolchain/uClibc/{uClibc-0.9.33-dup3.patch => uClibc-0.9.33.1-dup3.patch} (100%) create mode 100644 toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 64c5a9f..55e2f8b 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING string default 0.9.31.1 if BR2_UCLIBC_VERSION_0_9_31 default 0.9.32.1 if BR2_UCLIBC_VERSION_0_9_32 - default 0.9.33 if BR2_UCLIBC_VERSION_0_9_33 + default 0.9.33.1 if BR2_UCLIBC_VERSION_0_9_33 default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_CONFIG diff --git a/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch b/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch deleted file mode 100644 index 68077f5..0000000 --- a/toolchain/uClibc/uClibc-0.9.33-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ca457af92be7835edf77f34bead94f504fbc2d4b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 3 Feb 2012 10:57:44 -0800 -Subject: [PATCH 2/4] Declare __err and pass it to INTERNAL_SYSCALL_NCS so - subsequent macros can use it - -Signed-off-by: Khem Raj -Signed-off-by: Bernhard Reutner-Fischer ---- - libc/sysdeps/linux/common/bits/syscalls-common.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h -index faebd1b..0f5a929 100644 ---- a/libc/sysdeps/linux/common/bits/syscalls-common.h -+++ b/libc/sysdeps/linux/common/bits/syscalls-common.h -@@ -59,8 +59,8 @@ - #ifndef INLINE_SYSCALL_NOERR_NCS - # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...) \ - ({ \ -- /*INTERNAL_SYSCALL_DECL(__err);*/ \ -- long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args); \ -+ INTERNAL_SYSCALL_DECL(__err); \ -+ long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args); \ - __res; \ - }) - #endif --- -1.7.8.3 - diff --git a/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch b/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch deleted file mode 100644 index a9d1c96..0000000 --- a/toolchain/uClibc/uClibc-0.9.33-lstat-stat-fstat-Use-64bit-version-of-syscall.patch +++ /dev/null @@ -1,179 +0,0 @@ -From b813377f6c746118a9d2625e6b29ffeec4233663 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 3 Feb 2012 20:06:55 -0800 -Subject: [PATCH 3/4] lstat/stat/fstat: Use 64bit version of syscall if - available - -This is needed for stat'ing loop devices > 255 -since otherwise kernel returns EOVERFLOW becasue -it needs st_rdev/st_dev to be larger than 16bits but -in kernel it uses __old_kernel_stat for stat -syscall which has st_rdev/st_dev as unsigned short - -Add a testcase - -Signed-off-by: Khem Raj -Signed-off-by: Bernhard Reutner-Fischer ---- - libc/sysdeps/linux/common/fstat.c | 18 ++++++++++++++---- - libc/sysdeps/linux/common/lstat.c | 19 ++++++++++++++----- - libc/sysdeps/linux/common/stat.c | 18 ++++++++++++++---- - test/stat/stat-loop256.c | 32 ++++++++++++++++++++++++++++++++ - 4 files changed, 74 insertions(+), 13 deletions(-) - create mode 100644 test/stat/stat-loop256.c - -diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c -index acc639b..4726a68 100644 ---- a/libc/sysdeps/linux/common/fstat.c -+++ b/libc/sysdeps/linux/common/fstat.c -@@ -12,18 +12,28 @@ - #include - #include "xstatconv.h" - --#define __NR___syscall_fstat __NR_fstat --static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf) -- - int fstat(int fd, struct stat *buf) - { - int result; -+#ifdef __NR_fstat64 -+ /* normal stat call has limited values for various stat elements -+ * e.g. uid device major/minor etc. -+ * so we use 64 variant if available -+ * in order to get newer versions of stat elements -+ */ -+ struct kernel_stat64 kbuf; -+ result = INLINE_SYSCALL(fstat64, 2, fd, &kbuf); -+ if (result == 0) { -+ __xstat32_conv(&kbuf, buf); -+ } -+#else - struct kernel_stat kbuf; - -- result = __syscall_fstat(fd, &kbuf); -+ result = INLINE_SYSCALL(fstat, 2, fd, &kbuf); - if (result == 0) { - __xstat_conv(&kbuf, buf); - } -+#endif - return result; - } - libc_hidden_def(fstat) -diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c -index aa77447..db72d1f 100644 ---- a/libc/sysdeps/linux/common/lstat.c -+++ b/libc/sysdeps/linux/common/lstat.c -@@ -12,19 +12,28 @@ - #include - #include "xstatconv.h" - --#define __NR___syscall_lstat __NR_lstat --static __inline__ _syscall2(int, __syscall_lstat, -- const char *, file_name, struct kernel_stat *, buf) -- - int lstat(const char *file_name, struct stat *buf) - { - int result; -+#ifdef __NR_lstat64 -+ /* normal stat call has limited values for various stat elements -+ * e.g. uid device major/minor etc. -+ * so we use 64 variant if available -+ * in order to get newer versions of stat elements -+ */ -+ struct kernel_stat64 kbuf; -+ result = INLINE_SYSCALL(lstat64, 2, file_name, &kbuf); -+ if (result == 0) { -+ __xstat32_conv(&kbuf, buf); -+ } -+#else - struct kernel_stat kbuf; - -- result = __syscall_lstat(file_name, &kbuf); -+ result = INLINE_SYSCALL(lstat, 2, file_name, &kbuf); - if (result == 0) { - __xstat_conv(&kbuf, buf); - } -+#endif - return result; - } - libc_hidden_def(lstat) -diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c -index a6ab291..829f35a 100644 ---- a/libc/sysdeps/linux/common/stat.c -+++ b/libc/sysdeps/linux/common/stat.c -@@ -12,20 +12,30 @@ - #include - #include "xstatconv.h" - --#define __NR___syscall_stat __NR_stat - #undef stat --static __inline__ _syscall2(int, __syscall_stat, -- const char *, file_name, struct kernel_stat *, buf) - - int stat(const char *file_name, struct stat *buf) - { - int result; -+#ifdef __NR_stat64 -+ /* normal stat call has limited values for various stat elements -+ * e.g. uid device major/minor etc. -+ * so we use 64 variant if available -+ * in order to get newer versions of stat elements -+ */ -+ struct kernel_stat64 kbuf; -+ result = INLINE_SYSCALL(stat64, 2, file_name, &kbuf); -+ if (result == 0) { -+ __xstat32_conv(&kbuf, buf); -+ } -+#else - struct kernel_stat kbuf; - -- result = __syscall_stat(file_name, &kbuf); -+ result = INLINE_SYSCALL(stat, 2, file_name, &kbuf); - if (result == 0) { - __xstat_conv(&kbuf, buf); - } -+#endif - return result; - } - libc_hidden_def(stat) -diff --git a/test/stat/stat-loop256.c b/test/stat/stat-loop256.c -new file mode 100644 -index 0000000..14284c1 ---- /dev/null -+++ b/test/stat/stat-loop256.c -@@ -0,0 +1,32 @@ -+#include -+#include -+#include -+#include -+int main() -+{ -+ struct stat statbuf; -+ int ret = 0; -+ char* loop255 = "/dev/loop255"; -+ char* loop256 = "/dev/loop256"; -+ mode_t mode = 0660; -+ mknod(loop255, mode, 0x7ff); -+ mknod(loop256, mode, 0x100700); -+ ret = stat(loop255, &statbuf); -+ if(ret < 0) { -+ printf("stat: Cant stat %s\n",loop255); -+ unlink(loop255); -+ exit(1); -+ } -+ ret = stat(loop256, &statbuf); -+ if(ret < 0) { -+ printf("stat: Cant stat %s\n",loop256); -+ unlink(loop255); -+ unlink(loop256); -+ exit(1); -+ } -+ -+ unlink(loop255); -+ unlink(loop256); -+ exit(0); -+} -+ --- -1.7.8.3 - diff --git a/toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.33-define-MSG_CMSG_CLOEXEC.patch rename to toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch diff --git a/toolchain/uClibc/uClibc-0.9.33-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.33-dup3.patch rename to toolchain/uClibc/uClibc-0.9.33.1-dup3.patch diff --git a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch new file mode 100644 index 0000000..8b08a2c --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch @@ -0,0 +1,28 @@ +From 47009e1e1c6b721c38b5ffa2eeb9202fb8db298a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 11 Apr 2012 16:01:29 -0400 +Subject: [PATCH 1/2] mmap64: include stdint.h for uint64_t + +Some targets include this implicitly, but pull it in explicitly for those +which don't to fix building for them. + +Signed-off-by: Mike Frysinger +--- + libc/sysdeps/linux/common/mmap64.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c +index 3c97c84..cebf961 100644 +--- a/libc/sysdeps/linux/common/mmap64.c ++++ b/libc/sysdeps/linux/common/mmap64.c +@@ -10,6 +10,7 @@ + #ifdef __UCLIBC_HAS_LFS__ + + #include ++#include + #include + #include + #include +-- +1.7.3.4 +