svn commit: r356504 - head/share/mk
John Baldwin
jhb at FreeBSD.org
Wed Jan 8 17:49:35 UTC 2020
Author: jhb
Date: Wed Jan 8 17:49:34 2020
New Revision: 356504
URL: https://svnweb.freebsd.org/changeset/base/356504
Log:
Add -mno-relax to CFLAGS in bsd.prog/lib.mk instead of bsd.cpu.mk.
bsd.cpu.mk is included by bsd.init.mk before bsd.linker.mk, so it
was always setting the flag since LINKER_FEATURES wasn't defined.
Reported by: mhorne
Reviewed by: imp, mhorne
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D23076
Modified:
head/share/mk/bsd.cpu.mk
head/share/mk/bsd.lib.mk
head/share/mk/bsd.prog.mk
Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk Wed Jan 8 17:37:20 2020 (r356503)
+++ head/share/mk/bsd.cpu.mk Wed Jan 8 17:49:34 2020 (r356504)
@@ -375,10 +375,6 @@ CFLAGS += -march=rv64imac -mabi=lp64
.else
CFLAGS += -march=rv64imafdc -mabi=lp64d
.endif
-
-.if ${LINKER_FEATURES:U:Mriscv-relaxations} == ""
-CFLAGS += -mno-relax
-.endif
.endif
# NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Wed Jan 8 17:37:20 2020 (r356503)
+++ head/share/mk/bsd.lib.mk Wed Jan 8 17:49:34 2020 (r356504)
@@ -98,6 +98,10 @@ STATIC_CFLAGS+= -ftls-model=initial-exec
STATIC_CXXFLAGS+= -ftls-model=initial-exec
.endif
+.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == ""
+CFLAGS += -mno-relax
+.endif
+
.include <bsd.libnames.mk>
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk Wed Jan 8 17:37:20 2020 (r356503)
+++ head/share/mk/bsd.prog.mk Wed Jan 8 17:49:34 2020 (r356504)
@@ -57,6 +57,10 @@ LDFLAGS+= -Wl,-zretpolineplt
.endif
.endif
+.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == ""
+CFLAGS += -mno-relax
+.endif
+
.if defined(CRUNCH_CFLAGS)
CFLAGS+=${CRUNCH_CFLAGS}
.else
More information about the svn-src-all
mailing list