From patchwork Wed May 14 20:54:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle McMartin X-Patchwork-Id: 348972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4E4B7140088 for ; Thu, 15 May 2014 06:54:58 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:references :mime-version:content-type:in-reply-to; q=dns; s=default; b=GRHM JV5xm43gQhZ7EOmW6SPxKH8kjI9iEQeGfdQdjo7hzNk8w6TfTyvdfixk8K6UohBC mAxHJ05+YuZczl4B0ITQyIYEZYZt7NSbekQwmdfky5/13kjX25BHgCMBni+jvCkO S0HmjOceLZeJ9rTRFZJPqlDhh2VoVNzj2RpeGIk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:references :mime-version:content-type:in-reply-to; s=default; bh=+W8l6LcX8g iFdNdRpnfPpsHUan4=; b=dtE55txJifXqBFUtCv0k8Re3KqO3LPyzEcKS2rOY0K 6k5z+vpSj66FszZiURLWtkhLVXoa1h6Y9Uns+wkcYZRUqkJzsA4TAu2mX4mESdIp B6BJGpr7gI/Dsw2QowvWfNaZOOPKy3l5cfkP1saCLOhQ6JNUMR6mpXz/vyJhR7yI c= Received: (qmail 31013 invoked by alias); 14 May 2014 20:54:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 30998 invoked by uid 89); 14 May 2014 20:54:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Wed, 14 May 2014 16:54:48 -0400 From: Kyle McMartin To: libc-alpha@sourceware.org Subject: Re: [PATCH] fix static TLS consumption by TLS descriptors Message-ID: <20140514205448.GL26038@redacted.bos.redhat.com> References: <20140514203250.GK26038@redacted.bos.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140514203250.GK26038@redacted.bos.redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) On Wed, May 14, 2014 at 04:32:51PM -0400, Kyle McMartin wrote: > rth points out something more sensible than the if (0) ugliness which I like better. Thanks! --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -295,7 +295,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, # ifndef SHARED CHECK_STATIC_TLS (map, sym_map); # else - if (!TRY_STATIC_TLS (map, sym_map)) + if (1) { td->arg = _dl_make_tlsdesc_dynamic (sym_map, sym->st_value + reloc->r_addend); diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 899b256..f55a991 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -458,7 +458,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, # ifndef SHARED CHECK_STATIC_TLS (map, sym_map); # else - if (!TRY_STATIC_TLS (map, sym_map)) + if (1) { td->argument.pointer = _dl_make_tlsdesc_dynamic (sym_map, value); diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 368bee2..b6b5802 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -394,7 +394,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, # ifndef SHARED CHECK_STATIC_TLS (map, sym_map); # else - if (!TRY_STATIC_TLS (map, sym_map)) + if (1) { td->arg = _dl_make_tlsdesc_dynamic (sym_map, sym->st_value + (ElfW(Word))td->arg); diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 8df04a9..4ec4340 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -359,7 +359,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, # ifndef SHARED CHECK_STATIC_TLS (map, sym_map); # else - if (!TRY_STATIC_TLS (map, sym_map)) + if (1) { td->arg = _dl_make_tlsdesc_dynamic (sym_map, sym->st_value + reloc->r_addend);