From patchwork Tue May 20 20:56:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1039 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (peon2454.g.dreamhost.com [208.113.200.127]) by wilcox.dreamhost.com (Postfix) with ESMTP id AE5DE360098 for ; Tue, 20 May 2014 13:57:49 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id 408741949AB8; Tue, 20 May 2014 13:57:49 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com 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 homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 8D7801967709 for ; Tue, 20 May 2014 13:57:48 -0700 (PDT) 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:in-reply-to :references; q=dns; s=default; b=otMWupJ5C45KrX2pfQGLaynaucinIPq COYzUifA5uK4zc5sXVr7aBMCE9guE3vTRnxTWdLoOcCJ0PCJ/6ew8mpamepeqbqP pdk9MeD205lYGWHN7I37iyPRmaeOHFpPmSM7lof2MpgbwLvW3XtPkS8tXoQEdzhT cUwApglPeGU0= 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:in-reply-to :references; s=default; bh=iMpRmCSmbPGunKsOF9IdpBnz6oc=; b=j0aEK DFfGvnlMYvDC7lmppzXyFpyGRw9XyDyunj1J/BTn/jyfZmc/AAKDZfmUNJaVV3Bv z6NtmA7LNc9e634YyM8peP6+rdc3DQ7fQea9YkLc8ekWlzvuE0kdEPmKck8DZN75 Mm5AGl1eAMMtj1J+Oty8CIeCRAeISqtgpxw+KU= Received: (qmail 18605 invoked by alias); 20 May 2014 20:57:03 -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 18546 invoked by uid 89); 20 May 2014 20:57:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qc0-f169.google.com X-Received: by 10.140.19.133 with SMTP id 5mr60801744qgh.46.1400619419728; Tue, 20 May 2014 13:56:59 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Cc: marcus.shawcroft@gmail.com, Richard Henderson Subject: [PATCH 5/6] aarch64: Use tpidr_el0 rather than __read_tp in librt Date: Tue, 20 May 2014 13:56:17 -0700 Message-Id: <1400619378-7262-6-git-send-email-rth@twiddle.net> In-Reply-To: <1400619378-7262-1-git-send-email-rth@twiddle.net> References: <1400619378-7262-1-git-send-email-rth@twiddle.net> X-DH-Original-To: glibc@patchwork.siddhesh.in From: Richard Henderson * sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h [!IS_IN_libpthread && NOT_IN_libc] (SINGLE_THREAD_P): Use tpidr_el0 rather than __read_tp. --- sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h index 5cf3fd5..3578650 100644 --- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h @@ -108,8 +108,8 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # else # define SINGLE_THREAD_P(R) \ - adrp x##R, __local_multiple_threads; \ - ldr w##R, [x##R, #:lo12:__local_multiple_threads] + adrp x##R, __local_multiple_threads; \ + ldr w##R, [x##R, :lo12:__local_multiple_threads] # endif # else /* There is no __local_multiple_threads for librt, so use the TCB. */ @@ -119,17 +119,9 @@ extern int __local_multiple_threads attribute_hidden; header.multiple_threads) == 0, 1) # else # define SINGLE_THREAD_P(R) \ - stp x0, x30, [sp, -16]!; \ - cfi_adjust_cfa_offset (16); \ - cfi_rel_offset (x0, 0); \ - cfi_rel_offset (x30, 8); \ - bl __read_tp; \ - sub x0, x0, PTHREAD_SIZEOF; \ - ldr w##R, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET]; \ - ldp x0, x30, [sp], 16; \ - cfi_restore (x0); \ - cfi_restore (x30); \ - cfi_adjust_cfa_offset (-16) + mrs x##R, tpidr_el0; \ + sub x##R, x##R, PTHREAD_SIZEOF; \ + ldr w##R, [x##R, PTHREAD_MULTIPLE_THREADS_OFFSET] # endif # endif