svn commit: r354950 - in head: contrib/amd/amd usr.sbin/jail

[Ed Maste]

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