From patchwork Sat Nov 10 00:20:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zankel X-Patchwork-Id: 198166 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 9D2952C0080 for ; Sat, 10 Nov 2012 11:21:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6DA23A0206; Sat, 10 Nov 2012 00:21:10 +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 unXAqXhyP3DH; Sat, 10 Nov 2012 00:21:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E842BA00E9; Sat, 10 Nov 2012 00:20:32 +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 05D168F74A for ; Sat, 10 Nov 2012 00:20:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E45E18D471 for ; Sat, 10 Nov 2012 00:20:30 +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 1vebi8rLXsM1 for ; Sat, 10 Nov 2012 00:20:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 274528D1A4 for ; Sat, 10 Nov 2012 00:20:30 +0000 (UTC) Received: by mail-pb0-f43.google.com with SMTP id jt11so4623017pbb.16 for ; Fri, 09 Nov 2012 16:20:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:to:from:subject:x-gm-message-state; bh=urTvCSwLynw+Kyq/y7cIWPH9SW+sKFra7yfFP/Sxg7s=; b=IFMoJLoCNzIoPDzPJZhyB2UjIShS8q447mn+IBqbXwCHcGHa04M9WsA/8dQXF0gvcA Yz1U/A+keRJ+0dNNGzQ6i9xeulJLHPvHPg5BYfO+5WzmsfXr2p4pgcfstecnz+UHjnZi ZVmgkt3IRpf9M1ypcpsBLOAzviHiRLZqSI98GvlZxQFD2ZRD2ExCC/BkAl17eL7fJk0H I4CcYiMt/+5Jzedq69WE4XV8gu6EsMAtLiP5Zzzpv5v9+CQ10jsgL88/bU/LboBafcec Q9Y1sZvya0MR5jmUWXzS0vX4wfNWdmYAv05DjwMc++qsYTaX/Xgn32r2ZMkGTFnYVGvs xciw== Received: by 10.68.193.163 with SMTP id hp3mr37844741pbc.21.1352506830036; Fri, 09 Nov 2012 16:20:30 -0800 (PST) Received: from localhost (c-67-161-9-61.hsd1.ca.comcast.net. [67.161.9.61]) by mx.google.com with ESMTPS id sg7sm20228pbb.50.2012.11.09.16.20.27 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 16:20:29 -0800 (PST) Message-ID: <509d9dcd.c78f440a.3fc1.018d@mx.google.com> Received: by localhost (sSMTP sendmail emulation); Fri, 09 Nov 2012 16:20:27 -0800 Date: Fri, 09 Nov 2012 16:20:27 -0800 To: buildroot@busybox.com From: Chris Zankel X-Gm-Message-State: ALoCoQn/Yee69FU/X+zSOQnXYHSfJTzXZAq7bWfO0pJmfMAPzCorhY/ubkaO5Awg+i45BnqurTrU Subject: [Buildroot] [PATCH] uclibc-snapshot: remove obsolete patch and fix config 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 uClibc has added a new configuration item (LDSO_SAFE_RUNPATH), so add it to the uClibc-snapshot.config with the default value 'y'. The linuxthreads-errno-fix.patch doesn't apply cleanly anymore, and a similar patch for the 0.9.32.1 version wasn't carried over to 0.9.32.2, so should be save to remove it also for 'snapshot'. Signed-off-by: Chris Zankel diff --git a/toolchain/uClibc/uClibc-snapshot.config b/toolchain/uClibc/uClibc-snapshot.config index eb39df6..01fa998 100644 --- a/toolchain/uClibc/uClibc-snapshot.config +++ b/toolchain/uClibc/uClibc-snapshot.config @@ -83,6 +83,7 @@ HAVE_DOT_CONFIG=y DOPIC=y # ARCH_HAS_NO_SHARED is not set # ARCH_HAS_NO_LDSO is not set +LDSO_SAFE_RUNPATH=y HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y diff --git a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch deleted file mode 100644 index c4d0d00..0000000 --- a/toolchain/uClibc/uClibc.snapshot.linuxthreads-errno-fix.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af8b2d71ce37b9d4d24ddbc755cdea68de02949a Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 5 Jul 2010 14:08:17 +0200 -Subject: [PATCH] don't make __errno_location / __h_errno_location hidden - -Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089) - -__errno_location / __h_errno_location access has to go through the PLT -like malloc/free, so the linuxthread variants gets used instead when -compiling with -pthread. - -Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b - -Signed-off-by: Peter Korsgaard ---- - include/netdb.h | 1 - - libc/misc/internals/__errno_location.c | 3 --- - libc/misc/internals/__h_errno_location.c | 1 - - libc/sysdeps/linux/common/bits/errno.h | 1 - - 6 files changed, 0 insertions(+), 11 deletions(-) - -diff --git a/include/netdb.h b/include/netdb.h -index 9d3807d..ac411ab 100644 ---- a/include/netdb.h -+++ b/include/netdb.h -@@ -59,7 +59,6 @@ __BEGIN_DECLS - - /* Function to get address of global `h_errno' variable. */ - extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); --libc_hidden_proto(__h_errno_location) - - /* Macros for accessing h_errno from inside libc. */ - #ifdef _LIBC -diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c -index 487a9c2..0620860 100644 ---- a/libc/misc/internals/__errno_location.c -+++ b/libc/misc/internals/__errno_location.c -@@ -15,6 +15,3 @@ int * weak_const_function __errno_location (void) - { - return &errno; - } --#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */ --libc_hidden_weak(__errno_location) --#endif -diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c -index 213d398..235df4e 100644 ---- a/libc/misc/internals/__h_errno_location.c -+++ b/libc/misc/internals/__h_errno_location.c -@@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void) - { - return &h_errno; - } --libc_hidden_weak(__h_errno_location) -diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index 6e520fa..f4a9ebb 100644 ---- a/libc/sysdeps/linux/common/bits/errno.h -+++ b/libc/sysdeps/linux/common/bits/errno.h -@@ -43,7 +43,6 @@ - # ifndef __ASSEMBLER__ - /* Function to get address of global `errno' variable. */ - extern int *__errno_location (void) __THROW __attribute__ ((__const__)); --libc_hidden_proto(__errno_location) - - # ifdef __UCLIBC_HAS_THREADS__ - /* When using threads, errno is a per-thread value. */ --- -1.7.1 -