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
This commit is contained in:
parent
8491540808
commit
1da495d063
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user