From patchwork Sat Jan 6 19:14:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 856447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-88898-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="D2TaPVgZ"; dkim-atps=neutral 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 3zDWS7704Bz9s7F for ; Sun, 7 Jan 2018 06:14:31 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=VsgdTrkGR84nmNJGhbSS3n4pafi4GatLbU6mTX+vW1rdg6OUc8zid lm45WrfCekiLRa2Yzws8Bsg8/CSCzvld9Tpsk4WS5yaxZlOC5OnITyJlPVkT+9rJ ohsG6Q9bczmpbXPMxSEuPDYSmrhV4gLLaO6lPFGzAE0b7TUIwG8Me0= 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:from:to:cc:subject:date:message-id; s=default; bh=8gMN3Q1aksY2ae8Gci4NHhft6sk=; b=D2TaPVgZJp+2r+9hi/zbUpCucDic 7i6b8cLZYCFlHaE5mXKEpO6N/MsKnKhihj9edQkSXxasTfaL27xxKhUVjRWEGfHz QWyONCSgcerUo/2Nb4dGNUKpkDSksZbluEU6RzO8P4oKdOz805gTZ7YsYQ8IrRtm Xwmyrjc5bE4okX8= Received: (qmail 55456 invoked by alias); 6 Jan 2018 19:14:26 -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 55445 invoked by uid 89); 6 Jan 2018 19:14:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix build without NO_HIDDEN Date: Sat, 6 Jan 2018 20:14:18 +0100 Message-Id: <20180106191418.8028-1-samuel.thibault@ens-lyon.org> * sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_dynamic) [NO_RTLD_HIDDEN]: Call JUMPTARGET (___tls_get_addr) instead of HIDDEN_JUMPTARGET (___tls_get_addr). * sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Likewise. --- ChangeLog | 4 ++++ sysdeps/i386/dl-tlsdesc.S | 4 ++++ sysdeps/x86_64/dl-tlsdesc.S | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8833b1da33..ed8762118b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2018-01-06 Samuel Thibault * sysdeps/mach/hurd/i386/jmp_buf-macros.h: New file. + * sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_dynamic) [NO_RTLD_HIDDEN]: Call + JUMPTARGET (___tls_get_addr) instead of HIDDEN_JUMPTARGET + (___tls_get_addr). + * sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Likewise. 2018-01-05 Tulio Magno Quites Machado Filho diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S index 8c2c40b7ec..2c4764d1aa 100644 --- a/sysdeps/i386/dl-tlsdesc.S +++ b/sysdeps/i386/dl-tlsdesc.S @@ -126,7 +126,11 @@ _dl_tlsdesc_dynamic: .p2align 4,,7 .Lslow: cfi_adjust_cfa_offset (28) +#ifdef NO_RTLD_HIDDEN + call JUMPTARGET (___tls_get_addr) +#else call HIDDEN_JUMPTARGET (___tls_get_addr) +#endif jmp .Lret cfi_endproc .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S index 6c4e6b6c91..437bd8cde7 100644 --- a/sysdeps/x86_64/dl-tlsdesc.S +++ b/sysdeps/x86_64/dl-tlsdesc.S @@ -128,7 +128,11 @@ _dl_tlsdesc_dynamic: movq %r10, 40(%rsp) movq %r11, 48(%rsp) /* %rdi already points to the tlsinfo data structure. */ +#ifdef NO_RTLD_HIDDEN + call JUMPTARGET (__tls_get_addr) +#else call HIDDEN_JUMPTARGET (__tls_get_addr) +#endif movq 8(%rsp), %rdx movq 16(%rsp), %rcx movq 24(%rsp), %r8