From owner-svn-src-all@freebsd.org Thu Apr 27 22:40:40 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBF96D53C21; Thu, 27 Apr 2017 22:40:40 +0000 (UTC) (envelope-from br@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 mx1.freebsd.org (Postfix) with ESMTPS id AE30FFA8; Thu, 27 Apr 2017 22:40:40 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3RMedcG004942; Thu, 27 Apr 2017 22:40:39 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3RMedne004940; Thu, 27 Apr 2017 22:40:39 GMT (envelope-from br@FreeBSD.org) Message-Id: <201704272240.v3RMedne004940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Thu, 27 Apr 2017 22:40:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317530 - in head/lib/libc/riscv: . sys X-SVN-Group: head 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.23 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, 27 Apr 2017 22:40:41 -0000 Author: br Date: Thu Apr 27 22:40:39 2017 New Revision: 317530 URL: https://svnweb.freebsd.org/changeset/base/317530 Log: Use unconditional jr (jump register) so cerror relocation offset fits. This fixes libc build on riscv64sf. Reviewed by: jhb Sponsored by: DARPA, AFRL Modified: head/lib/libc/riscv/SYS.h head/lib/libc/riscv/sys/vfork.S Modified: head/lib/libc/riscv/SYS.h ============================================================================== --- head/lib/libc/riscv/SYS.h Thu Apr 27 22:28:49 2017 (r317529) +++ head/lib/libc/riscv/SYS.h Thu Apr 27 22:40:39 2017 (r317530) @@ -54,8 +54,10 @@ END(__sys_##name) ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ - bnez t0, cerror; \ + bnez t0, 1f; \ ret; \ +1: la t1, cerror; \ + jr t1; \ END(__sys_##name) #define RSYSCALL(name) \ @@ -63,6 +65,8 @@ ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ - bnez t0, cerror; \ + bnez t0, 1f; \ ret; \ +1: la t1, cerror; \ + jr t1; \ END(__sys_##name) Modified: head/lib/libc/riscv/sys/vfork.S ============================================================================== --- head/lib/libc/riscv/sys/vfork.S Thu Apr 27 22:28:49 2017 (r317529) +++ head/lib/libc/riscv/sys/vfork.S Thu Apr 27 22:40:39 2017 (r317530) @@ -42,10 +42,12 @@ ENTRY(__sys_vfork) mv a2, ra _SYSCALL(vfork) - bnez t0, cerror + bnez t0, 1f addi a1, a1, -1 and a0, a0, a1 mv ra, a2 ret +1: la t1, cerror + jr t1 END(__sys_vfork)