From owner-svn-src-head@freebsd.org Thu Nov 21 13:56:17 2019 Return-Path: Delivered-To: svn-src-head@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 D32441BF73A; Thu, 21 Nov 2019 13:56:17 +0000 (UTC) (envelope-from emaste@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 47Jh1F5DJGz4QQc; Thu, 21 Nov 2019 13:56:17 +0000 (UTC) (envelope-from emaste@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 96A6BC437; Thu, 21 Nov 2019 13:56:17 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xALDuHbe041488; Thu, 21 Nov 2019 13:56:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xALDuHGs041485; Thu, 21 Nov 2019 13:56:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201911211356.xALDuHGs041485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 21 Nov 2019 13:56:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354950 - in head: contrib/amd/amd usr.sbin/jail X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: contrib/amd/amd usr.sbin/jail X-SVN-Commit-Revision: 354950 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2019 13:56:17 -0000 Author: emaste Date: Thu Nov 21 13:56:16 2019 New Revision: 354950 URL: https://svnweb.freebsd.org/changeset/base/354950 Log: revert r354935 and apply fix for cleandir failure This reapplies the RISC-V GNU ld workaround from r354896, r354899, and 354900, along with a fix for the build failure during cleandir. LINKER_TYPE was not being set during cleandir, resulting in Malformed conditional (${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv") from Cirrus-CI. PR: 242109 Sponsored by: The FreeBSD Foundation Modified: head/contrib/amd/amd/amd.8 head/contrib/amd/amd/amd.c head/usr.sbin/jail/Makefile Modified: head/contrib/amd/amd/amd.8 ============================================================================== --- head/contrib/amd/amd/amd.8 Thu Nov 21 13:46:16 2019 (r354949) +++ head/contrib/amd/amd/amd.8 Thu Nov 21 13:56:16 2019 (r354950) @@ -72,7 +72,8 @@ .Ar ... .Sh DESCRIPTION .Bf -symbolic -This daemon is obsolete. +This daemon is deprecated and will be removed before +.Fx 13.0 . Users are advised to use .Xr autofs 5 instead. Modified: head/contrib/amd/amd/amd.c ============================================================================== --- head/contrib/amd/amd/amd.c Thu Nov 21 13:46:16 2019 (r354949) +++ head/contrib/amd/amd/amd.c Thu Nov 21 13:56:16 2019 (r354950) @@ -414,6 +414,8 @@ main(int argc, char *argv[]) progname = "amd"; am_set_progname(progname); + plog(XLOG_WARNING, "built-in amd in FreeBSD is deprecated and will be removed before FreeBSD 13"); + /* * Initialize process id. This is kept * cached since it is used for generating Modified: head/usr.sbin/jail/Makefile ============================================================================== --- head/usr.sbin/jail/Makefile Thu Nov 21 13:46:16 2019 (r354949) +++ head/usr.sbin/jail/Makefile Thu Nov 21 13:56:16 2019 (r354950) @@ -15,6 +15,13 @@ NO_WMISSING_VARIABLE_DECLARATIONS= YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} +# workaround for GNU ld (GNU Binutils) 2.33.1: +# relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2' +# https://bugs.freebsd.org/242109 +.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv" +CFLAGS+=-Wl,--no-relax +.endif + .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif