From owner-svn-src-all@freebsd.org  Thu Nov 21 04:12:09 2019
Return-Path: <owner-svn-src-all@freebsd.org>
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 99C901ACB21;
 Thu, 21 Nov 2019 04:12:09 +0000 (UTC) (envelope-from gjb@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 47JR3F3c1qz3KTZ;
 Thu, 21 Nov 2019 04:12:09 +0000 (UTC) (envelope-from gjb@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 5EC515A65;
 Thu, 21 Nov 2019 04:12:09 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAL4C9ZW000257;
 Thu, 21 Nov 2019 04:12:09 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAL4C9YR000256;
 Thu, 21 Nov 2019 04:12:09 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201911210412.xAL4C9YR000256@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 21 Nov 2019 04:12:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r354935 - head/usr.sbin/jail
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/usr.sbin/jail
X-SVN-Commit-Revision: 354935
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.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2019 04:12:09 -0000

Author: gjb
Date: Thu Nov 21 04:12:08 2019
New Revision: 354935
URL: https://svnweb.freebsd.org/changeset/base/354935

Log:
  Revert r354896, r354899, r354900:
   Fix build.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  head/usr.sbin/jail/Makefile

Modified: head/usr.sbin/jail/Makefile
==============================================================================
--- head/usr.sbin/jail/Makefile	Thu Nov 21 03:10:02 2019	(r354934)
+++ head/usr.sbin/jail/Makefile	Thu Nov 21 04:12:08 2019	(r354935)
@@ -15,13 +15,6 @@ 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 ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv"
-CFLAGS+=-Wl,--no-relax
-.endif
-
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif