From patchwork Thu Dec 5 17:20:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 297221 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 AF0102C009D for ; Fri, 6 Dec 2013 04:21:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A6F91934E8; Thu, 5 Dec 2013 17:21:22 +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 HAEZgEAcwMQ5; Thu, 5 Dec 2013 17:21:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C4C99933DC; Thu, 5 Dec 2013 17:21:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D88D01BF9A6 for ; Thu, 5 Dec 2013 17:21:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D4DB5933C5 for ; Thu, 5 Dec 2013 17:21:12 +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 DxaMHzQ0GBdZ for ; Thu, 5 Dec 2013 17:21:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by hemlock.osuosl.org (Postfix) with ESMTP id F170293386 for ; Thu, 5 Dec 2013 17:21:11 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 763007D1; Thu, 5 Dec 2013 18:21:13 +0100 (CET) Received: from localhost (AToulouse-651-1-277-143.w109-220.abo.wanadoo.fr [109.220.216.143]) by mail.free-electrons.com (Postfix) with ESMTPSA id 25570735; Thu, 5 Dec 2013 18:21:13 +0100 (CET) From: Thomas Petazzoni To: Buildroot List Date: Thu, 5 Dec 2013 18:20:50 +0100 Message-Id: <1386264059-14057-8-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1386264059-14057-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1386264059-14057-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Mischa Jonker , Mischa Jonker Subject: [Buildroot] [PATCH 07/16] uclibc: arc: Use git instead of website 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 From: Mischa Jonker Signed-off-by: Mischa Jonker Signed-off-by: Thomas Petazzoni --- package/uclibc/0.9.33-arc/fix-fstat-for-be.patch | 32 ------------------- .../uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch | 37 ---------------------- package/uclibc/0.9.33-arc/fix-susv3-legacy.patch | 36 --------------------- .../0.9.33-arc/uclibc-arc-add-__kernel_long.patch | 29 ----------------- package/uclibc/Config.in | 9 ++---- package/uclibc/uclibc.mk | 7 ++-- 6 files changed, 7 insertions(+), 143 deletions(-) delete mode 100644 package/uclibc/0.9.33-arc/fix-fstat-for-be.patch delete mode 100644 package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch delete mode 100644 package/uclibc/0.9.33-arc/fix-susv3-legacy.patch delete mode 100644 package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch diff --git a/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch b/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch deleted file mode 100644 index 2cdb517..0000000 --- a/package/uclibc/0.9.33-arc/fix-fstat-for-be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f394d65c74631a0e715bac582b09c302ee84114f Mon Sep 17 00:00:00 2001 -From: Mischa Jonker -Date: Tue, 23 Jul 2013 17:59:04 +0200 -Subject: [PATCH] libc/sysdeps: Fix common-generic stat.h for BE part 2 - -Previous patch only fixed the build. This patch fixes the behavior at -run-time as well. - -It fixes "Value too large for defined data type" messages caused by -fstat syscall wrapper returning -EOVERFLOW. - -Signed-off-by: Mischa Jonker ---- - libc/sysdeps/linux/common-generic/bits/stat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/common-generic/bits/stat.h b/libc/sysdeps/linux/common-generic/bits/stat.h -index 07716ab..945c408 100644 ---- a/libc/sysdeps/linux/common-generic/bits/stat.h -+++ b/libc/sysdeps/linux/common-generic/bits/stat.h -@@ -63,8 +63,8 @@ struct stat - unsigned long long __pad4; - long __pad5; - long st_size; /* Size of file, in bytes. */ -- int __pad6; - int st_blksize; /* Optimal block size for I/O. */ -+ int __pad6; - long __pad7; - long st_blocks; /* Number 512-byte blocks allocated */ - # endif /* __LITTLE_ENDIAN */ --- -1.7.9.5 diff --git a/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch b/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch deleted file mode 100644 index e0884ea..0000000 --- a/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0594ba53b9b8d9a1ac409fd187e4d1ba8f2e7f2a Mon Sep 17 00:00:00 2001 -From: Vineet Gupta -Date: Thu, 8 Aug 2013 15:41:51 +0530 -Subject: [PATCH] ARC: SuSv3 legacy support: Add "bcmp" alias for memcmp - -Although uClibc provides this already as UCLIBC_SUSV3_LEGACY_MACROS, -that however requires UCLIBC_SUSV3_LEGACY to be switched off, causing a -bunch of other things to be not available (usleep) - -Signed-off-by: Vineet Gupta ---- - libc/string/arc/memcmp.S | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libc/string/arc/memcmp.S b/libc/string/arc/memcmp.S -index 0c7c345..cb25990 100644 ---- a/libc/string/arc/memcmp.S -+++ b/libc/string/arc/memcmp.S -@@ -1,6 +1,7 @@ - /* Copyright (C) 2007 ARC International (UK) LTD */ - - #include -+#include - - #ifdef __LITTLE_ENDIAN__ - #define WORD2 r2 -@@ -115,3 +116,7 @@ ENTRY(memcmp) - j_s.d [blink] - mov r0,0 - ENDFUNC(memcmp) -+ -+#ifdef __UCLIBC_SUSV3_LEGACY__ -+strong_alias(memcmp,bcmp) -+#endif --- -1.8.1.2 - diff --git a/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch b/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch deleted file mode 100644 index a768024..0000000 --- a/package/uclibc/0.9.33-arc/fix-susv3-legacy.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3124ace804337d32974392e0a73a09cdc0d60fc8 Mon Sep 17 00:00:00 2001 -From: Mischa Jonker -Date: Mon, 15 Jul 2013 13:06:11 +0200 -Subject: [PATCH] ARC: Add alias 'index' to strcmp for susv3 legacy - compatibility - -This fixes build errors for 'keyutils' - -Signed-off-by: Mischa Jonker ---- - libc/string/arc/strchr.S | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libc/string/arc/strchr.S b/libc/string/arc/strchr.S -index b9f28c0..8d51aa4 100644 ---- a/libc/string/arc/strchr.S -+++ b/libc/string/arc/strchr.S -@@ -1,6 +1,7 @@ - /* Copyright (C) 2007 ARC International (UK) LTD */ - - #include -+#include - - /* ARC700 has a relatively long pipeline and branch prediction, so we want - to avoid branches that are hard to predict. On the other hand, the -@@ -115,3 +116,7 @@ ENTRY(strchr) - mov.mi r0,0 - #endif /* ENDIAN */ - ENDFUNC(strchr) -+ -+#ifdef __UCLIBC_SUSV3_LEGACY__ -+strong_alias(strchr,index) -+#endif --- -1.7.9.5 - diff --git a/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch b/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch deleted file mode 100644 index caebac1..0000000 --- a/package/uclibc/0.9.33-arc/uclibc-arc-add-__kernel_long.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5164fb28e9205626211d0436933e6eb4960be582 Mon Sep 17 00:00:00 2001 -From: Mischa Jonker -Date: Wed, 10 Jul 2013 09:05:25 +0200 -Subject: [PATCH] ARC: libc/sysdeps: add __kernel_long and __kernel_ulong - -Linux 3.4 added these two types and updated various exported header -files to use them. While other architectures were updated before, -this was not the case for ARC. - -This fixes the build failure with Linux 3.10 headers. - -Signed-off-by: Mischa Jonker ---- - libc/sysdeps/linux/arc/bits/kernel_types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libc/sysdeps/linux/arc/bits/kernel_types.h b/libc/sysdeps/linux/arc/bits/kernel_types.h -index fd52e1c..fc28fa1 100755 ---- a/libc/sysdeps/linux/arc/bits/kernel_types.h -+++ b/libc/sysdeps/linux/arc/bits/kernel_types.h -@@ -39,6 +39,8 @@ typedef __kernel_uid_t __kernel_old_uid_t; - typedef __kernel_gid_t __kernel_old_gid_t; - typedef long long __kernel_loff_t; - typedef unsigned int __kernel_old_dev_t; -+typedef long __kernel_long_t; -+typedef unsigned long __kernel_ulong_t; - - typedef struct { - #ifdef __USE_ALL diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 82dd3aa..7b2d6a7 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -20,12 +20,9 @@ choice bool "uClibc 0.9.33.x" depends on !(BR2_arc || BR2_avr32 || BR2_xtensa) - config BR2_UCLIBC_VERSION_0_9_33_ARC - bool "uClibc 0.9.33.x-arc" - depends on BR2_arc - config BR2_UCLIBC_VERSION_SNAPSHOT bool "daily snapshot" + depends on !(BR2_arc) endchoice @@ -41,7 +38,7 @@ config BR2_UCLIBC_VERSION_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.2 if BR2_UCLIBC_VERSION_0_9_33 - default 0.9.33-arc if BR2_UCLIBC_VERSION_0_9_33_ARC + default "9f0f466d3b17181ce88be36ce24a775774fe686c" if BR2_arc default BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_CONFIG @@ -49,7 +46,7 @@ config BR2_UCLIBC_CONFIG default "package/uclibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31 default "package/uclibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32 default "package/uclibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33 - default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_0_9_33_ARC + default "package/uclibc/uClibc-snapshot.config" if BR2_arc default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT help Some people may wish to use their own modified uClibc configuration diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 20d3bb6..de9011f 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -5,12 +5,13 @@ ################################################################################ UCLIBC_VERSION = $(call qstrip,$(BR2_UCLIBC_VERSION_STRING)) -UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.bz2 +UCLIBC_SOURCE ?= uClibc-$(UCLIBC_VERSION).tar.bz2 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots -else ifeq ($(findstring arc,$(UCLIBC_VERSION)),arc) -UCLIBC_SITE = $(BR2_ARC_SITE) +else ifeq ($(BR2_arc),y) +UCLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,uClibc,$(UCLIBC_VERSION)) +UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.gz else UCLIBC_SITE = http://www.uclibc.org/downloads UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz