diff options
| -rw-r--r-- | main/libc0.9.32/APKBUILD | 8 | ||||
| -rw-r--r-- | main/libc0.9.32/ldso-x86_64-support-protected-symbols.patch | 111 |
2 files changed, 3 insertions, 116 deletions
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 88bb77e153..e2b83f2f9f 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -2,9 +2,9 @@ _abiver=0.9.32 pkgname=libc$_abiver _gitver= -pkgver=${_abiver}_rc1 +pkgver=0.9.32_rc2 _ver=${pkgver/_/-} -pkgrel=1 +pkgrel=0 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -20,7 +20,6 @@ _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2" _snapfile="$pkgname-$pkgver.tar.bz2" source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 compat-stack-guard.patch - ldso-x86_64-support-protected-symbols.patch 1.patch 2.patch 0001-libm-x86_64-implement-fesetround.patch @@ -117,9 +116,8 @@ libthread_db() { mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/ } -md5sums="ec2ec3e187bd68327ee94c31846d275a uClibc-0.9.32-rc1.tar.bz2 +md5sums="c8d2cd2c4dbcf5218b6db843cf66ac0f uClibc-0.9.32-rc2.tar.bz2 4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch -84a2786fb4c89bee56607dd09b538d7b ldso-x86_64-support-protected-symbols.patch 8f55efc31c41bf70d99006a7d2f7fe1e 1.patch 350a608e3d3b148af882f6e074225465 2.patch e0c901502602f7e9e002d910d0f32ab9 0001-libm-x86_64-implement-fesetround.patch diff --git a/main/libc0.9.32/ldso-x86_64-support-protected-symbols.patch b/main/libc0.9.32/ldso-x86_64-support-protected-symbols.patch deleted file mode 100644 index 7fb2079346..0000000000 --- a/main/libc0.9.32/ldso-x86_64-support-protected-symbols.patch +++ /dev/null @@ -1,111 +0,0 @@ - -Delivered-To: natanael.copa@gmail.com -Received: by 10.204.57.144 with SMTP id c16cs140877bkh; - Tue, 27 Apr 2010 04:45:38 -0700 (PDT) -Received: by 10.115.117.31 with SMTP id u31mr2295920wam.70.1272368736591; - Tue, 27 Apr 2010 04:45:36 -0700 (PDT) -Return-Path: <uclibc-bounces@uclibc.org> -Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) - by mx.google.com with ESMTP id c19si12462637wam.6.2010.04.27.04.45.35; - Tue, 27 Apr 2010 04:45:36 -0700 (PDT) -Received-SPF: neutral (google.com: 140.211.166.133 is neither permitted nor denied by best guess record for domain of uclibc-bounces@uclibc.org) client-ip=140.211.166.133; -Authentication-Results: mx.google.com; spf=neutral (google.com: 140.211.166.133 is neither permitted nor denied by best guess record for domain of uclibc-bounces@uclibc.org) smtp.mail=uclibc-bounces@uclibc.org -Received: from localhost (localhost [127.0.0.1]) - by hemlock.osuosl.org (Postfix) with ESMTP id B6302A01E3; - Tue, 27 Apr 2010 11:45:35 +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 kiaCRkQJ5gmf; Tue, 27 Apr 2010 11:45:35 +0000 (UTC) -Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) - by hemlock.osuosl.org (Postfix) with ESMTP id A0771A0163; - Tue, 27 Apr 2010 11:45:33 +0000 (UTC) -X-Original-To: uclibc@lists.busybox.net -Delivered-To: uclibc@osuosl.org -Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) - by ash.osuosl.org (Postfix) with ESMTP id E803C8FB08 - for <uclibc@lists.busybox.net>; Tue, 27 Apr 2010 11:45:32 +0000 (UTC) -Received: from localhost (localhost [127.0.0.1]) - by hemlock.osuosl.org (Postfix) with ESMTP id E0E39A0155 - for <uclibc@lists.busybox.net>; Tue, 27 Apr 2010 11:45:32 +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 HY2RZ4thZB+H for <uclibc@lists.busybox.net>; - Tue, 27 Apr 2010 11:45:32 +0000 (UTC) -X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 -Received: from office.altell.ru (office.altell.ru [80.246.246.162]) - by hemlock.osuosl.org (Postfix) with ESMTP id 01EC9A0067 - for <uclibc@uclibc.org>; Tue, 27 Apr 2010 11:45:32 +0000 (UTC) -Received: from localhost.localdomain (build2.altell.local [192.168.1.26]) - by mail.altell.local (Postfix) with ESMTP id A39ED68413; - Tue, 27 Apr 2010 15:44:50 +0400 (MSD) -From: Roman I Khimov <khimov@altell.ru> -To: uclibc@uclibc.org -Subject: [PATCH] ldso/x86_64: support protected symbols -Date: Tue, 27 Apr 2010 15:43:14 +0400 -Message-Id: <1272368594-30939-1-git-send-email-khimov@altell.ru> -X-Mailer: git-send-email 1.5.6.5 -X-Altell-MailScanner-ID: A39ED68413.B8040 -X-Altell-MailScanner: Found to be clean -X-Altell-MailScanner-From: khimov@altell.ru -X-BeenThere: uclibc@uclibc.org -X-Mailman-Version: 2.1.11 -Precedence: list -List-Id: "Discussion and development of uClibc \(the embedded C library\)" - <uclibc.uclibc.org> -List-Unsubscribe: <http://lists.busybox.net/mailman/options/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=unsubscribe> -List-Archive: <http://lists.busybox.net/pipermail/uclibc> -List-Post: <mailto:uclibc@uclibc.org> -List-Help: <mailto:uclibc-request@uclibc.org?subject=help> -List-Subscribe: <http://lists.busybox.net/mailman/listinfo/uclibc>, - <mailto:uclibc-request@uclibc.org?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: uclibc-bounces@uclibc.org -Errors-To: uclibc-bounces@uclibc.org - -Fixes dltest with NPTL. - -Signed-off-by: Roman I Khimov <khimov@altell.ru> ---- - ldso/ldso/x86_64/elfinterp.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c -index 54528d3..ec53c48 100644 ---- a/ldso/ldso/x86_64/elfinterp.c -+++ b/ldso/ldso/x86_64/elfinterp.c -@@ -172,7 +172,9 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope, - symbol_addr = 0; - symname = strtab + sym->st_name; - -- if (symtab_index) { -+ if (symtab_index && -+ (ELF64_ST_VISIBILITY(symtab[symtab_index].st_other) -+ != STV_PROTECTED)) { - symbol_addr = (ElfW(Addr))_dl_find_hash(symname, scope, tpnt, - elf_machine_type_class(reloc_type), &tls_tpnt); - /* -@@ -189,7 +191,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope, - /* Relocs against STN_UNDEF are usually treated as using a - * symbol value of zero, and using the module containing the - * reloc itself. */ -- symbol_addr = sym->st_value; -+ if (symtab_index) -+ symbol_addr = DL_FIND_HASH_VALUE(tpnt, elf_machine_type_class(reloc_type), -+ sym); -+ else -+ symbol_addr = sym->st_value; - tls_tpnt = tpnt; - } - --- -1.5.6.5 - -_______________________________________________ -uClibc mailing list -uClibc@uclibc.org -http://lists.busybox.net/mailman/listinfo/uclibc |