From owner-svn-src-all@freebsd.org Thu May 7 15:59:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F5462DCD4E; Thu, 7 May 2020 15:59:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49HypM6hxqz4LFR; Thu, 7 May 2020 15:59:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E149C1B86E; Thu, 7 May 2020 15:59:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047FxtX8095562; Thu, 7 May 2020 15:59:55 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047Fxtp0095560; Thu, 7 May 2020 15:59:55 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202005071559.047Fxtp0095560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 7 May 2020 15:59:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360783 - stable/12/lib/libc/riscv/gen X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: stable/12/lib/libc/riscv/gen X-SVN-Commit-Revision: 360783 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2020 15:59:56 -0000 Author: jhb Date: Thu May 7 15:59:55 2020 New Revision: 360783 URL: https://svnweb.freebsd.org/changeset/base/360783 Log: MFC 355403: Use "far" calls and branches so that lld uses valid relocations. Conditional branch and jump instructions do not always call via PLT stubs and thus will not honor LD_PRELOAD, etc. lld warns about using non-preemptible relocations for preemptible or unknown symbols whereas bfd does not (at least for RISC-V). Modified: stable/12/lib/libc/riscv/gen/setjmp.S stable/12/lib/libc/riscv/gen/sigsetjmp.S Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/riscv/gen/setjmp.S ============================================================================== --- stable/12/lib/libc/riscv/gen/setjmp.S Thu May 7 15:12:56 2020 (r360782) +++ stable/12/lib/libc/riscv/gen/setjmp.S Thu May 7 15:59:55 2020 (r360783) @@ -46,7 +46,7 @@ ENTRY(setjmp) addi a2, a0, (_JB_SIGMASK * 8) /* oset */ li a1, 0 /* set */ li a0, 1 /* SIG_BLOCK */ - jal sigprocmask + call _C_LABEL(sigprocmask) ld a0, 0(sp) ld ra, 8(sp) @@ -110,7 +110,7 @@ ENTRY(longjmp) li a2, 0 /* oset */ addi a1, a0, (_JB_SIGMASK * 8) /* set */ li a0, 3 /* SIG_BLOCK */ - jal sigprocmask + call _C_LABEL(sigprocmask) ld a1, (2 * 8)(sp) ld ra, (1 * 8)(sp) Modified: stable/12/lib/libc/riscv/gen/sigsetjmp.S ============================================================================== --- stable/12/lib/libc/riscv/gen/sigsetjmp.S Thu May 7 15:12:56 2020 (r360782) +++ stable/12/lib/libc/riscv/gen/sigsetjmp.S Thu May 7 15:59:55 2020 (r360783) @@ -38,8 +38,10 @@ __FBSDID("$FreeBSD$"); #include ENTRY(sigsetjmp) - beqz a1, _C_LABEL(_setjmp) - j _C_LABEL(setjmp) + beqz a1, 1f + tail _C_LABEL(setjmp) +1: + tail _C_LABEL(_setjmp) END(sigsetjmp) ENTRY(siglongjmp) @@ -48,8 +50,10 @@ ENTRY(siglongjmp) ld a3, 0(a0) /* Check the magic */ - beq a2, a3, _C_LABEL(_longjmp) - j _C_LABEL(longjmp) + beq a2, a3, 1f + tail _C_LABEL(longjmp) +1: + tail _C_LABEL(_longjmp) .align 3 .Lmagic: