From patchwork Thu Oct 28 06:50:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 46730 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AC714385843B for ; Thu, 28 Oct 2021 06:51:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC714385843B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635403891; bh=OV25jOAwuLljb/mtsH9XzPDQ/w8a5SIIt2HzaT7euo8=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=E3jDWvdmq7Dye4LPKBOzrb7jhdAVjAIEZKQer8no2AlSRJjlvd+Zwv14hOOPg+lgX bmVJ9Dfzii0xf7+PFG8XAnKxmSTrGHDJHFa9E5yES9BdBJIycoxbbi9K9gY58Sx2DK QkcOEe5W4Ml7tQz7Xd7mN6bKBNOS5nT+eG/Cgz1I= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id 51C793858437 for ; Thu, 28 Oct 2021 06:50:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51C793858437 Received: by mail-yb1-xb49.google.com with SMTP id s189-20020a252cc6000000b005c1f206d91eso1284271ybs.14 for ; Wed, 27 Oct 2021 23:50:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=OV25jOAwuLljb/mtsH9XzPDQ/w8a5SIIt2HzaT7euo8=; b=nLop20U7M4L6gLXxl/+JlO81X0RPeYdXGjrl0oW/6dDX5xJ/1nlvjZ3yBFf3l+gbEX 4ZFmxQEVGlplmLq6qBnFYwANn5bnXmv8t/DnsMKuAc0+QSQA+Bo0aK11rbyZEqplDbC0 OPhDH/do2FpYVJADnimjd/SKyQnVBN/OY+mLLtHMuigoea3n3XmrsNRudNFJgGQwjom6 FtqJRTtD2cfkgKb0+kQuqfiOBMJ0fMDIwQzNHSamO0c24jcQBwYKV5hSsQBZbCsaUHES HXAaqHD6eRy3fuyD2qMEnNuDgnrBBRwNpBdiHcBBUeAVX4P7/Cx3uw26+m8hxbPH8vdU j5PQ== X-Gm-Message-State: AOAM533RZJU1vLGSXQoqBtW7BM1bLvs1EUrob8SaJ+W1A1JtY36v3AlP g2tv/JbhQTGY674Kp1vkLIadEayy5qBqZJA9/VzGYhLYRVRuGgn0rY41ZrkJeetN1xUD6NENMdq ZZ06+wIJLCmWyYbP279FRdx9eKJ5icqLOb5KhXSMipGJVn8lK33LXDF8SBXnvJujTfpWX X-Google-Smtp-Source: ABdhPJy2RmQcW9KkgWYB5MeUIgGUIfEtHsqgeE6iArXLaQggFu57r0d12ZYONDLglVnbpDxNQETnN4aaYTFY X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:200:5bee:97c3:491b:d4cf]) (user=maskray job=sendgmr) by 2002:a25:10d7:: with SMTP id 206mr2522628ybq.339.1635403854691; Wed, 27 Oct 2021 23:50:54 -0700 (PDT) Date: Wed, 27 Oct 2021 23:50:19 -0700 Message-Id: <20211028065019.3247061-1-maskray@google.com> Mime-Version: 1.0 Subject: [PATCH] riscv: Fix incorrect jal with HIDDEN_JUMPTARGET To: libc-alpha@sourceware.org, Darius Rad , Palmer Dabbelt , Adhemerval Zanella X-Spam-Status: No, score=-19.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" A non-local STV_DEFAULT defined symbol is by default preemptible in a shared object. j/jal cannot target a preemptible symbol. On other architectures, such a jump instruction either causes PLT [BZ #18822], or if short-ranged, sometimes rejected by the linker (but not by GNU ld's riscv port [ld PR/28509]). Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. With this patch, ld.so and libc.so can be linked with LLD if source files are compiled/assembled with -mno-relax/-Wa,-mno-relax. Reviewed-by: Adhemerval Zanella Acked-by: Palmer Dabbelt --- sysdeps/riscv/setjmp.S | 2 +- sysdeps/unix/sysv/linux/riscv/setcontext.S | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S index 0b92016b31..bec7ff80f4 100644 --- a/sysdeps/riscv/setjmp.S +++ b/sysdeps/riscv/setjmp.S @@ -21,7 +21,7 @@ ENTRY (_setjmp) li a1, 0 - j __sigsetjmp + j HIDDEN_JUMPTARGET (__sigsetjmp) END (_setjmp) ENTRY (setjmp) li a1, 1 diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S index 9510518750..e44a68aad4 100644 --- a/sysdeps/unix/sysv/linux/riscv/setcontext.S +++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S @@ -95,6 +95,7 @@ LEAF (__setcontext) 99: j __syscall_error END (__setcontext) +libc_hidden_def (__setcontext) weak_alias (__setcontext, setcontext) LEAF (__start_context) @@ -108,7 +109,7 @@ LEAF (__start_context) /* Invoke subsequent context if present, else exit(0). */ mv a0, s2 beqz s2, 1f - jal __setcontext -1: j exit + jal HIDDEN_JUMPTARGET (__setcontext) +1: j HIDDEN_JUMPTARGET (exit) END (__start_context)