svn commit: r355428 - in head: share/mk sys/conf

John Baldwin jhb at FreeBSD.org
Thu Dec 5 19:37:31 UTC 2019


Author: jhb
Date: Thu Dec  5 19:37:30 2019
New Revision: 355428
URL: https://svnweb.freebsd.org/changeset/base/355428

Log:
  Add a new "riscv-relaxations" linker feature.
  
  When the linker doesn't have this feature, add -mno-relax to CFLAGS
  on RISC-V.
  
  Define the feature for ld.bfd, but not lld.  If lld gains relaxation
  support in a newer version, we can enable it for those versions of lld
  in bsd.linker.mk.
  
  Reviewed by:	mhorne
  Sponsored by:	DARPA
  Differential Revision:	https://reviews.freebsd.org/D22659

Modified:
  head/share/mk/bsd.cpu.mk
  head/share/mk/bsd.linker.mk
  head/sys/conf/kern.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Thu Dec  5 19:25:49 2019	(r355427)
+++ head/share/mk/bsd.cpu.mk	Thu Dec  5 19:37:30 2019	(r355428)
@@ -375,6 +375,10 @@ 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.linker.mk
==============================================================================
--- head/share/mk/bsd.linker.mk	Thu Dec  5 19:25:49 2019	(r355427)
+++ head/share/mk/bsd.linker.mk	Thu Dec  5 19:37:30 2019	(r355428)
@@ -86,6 +86,9 @@ ${X_}LINKER_FEATURES=
 ${X_}LINKER_FEATURES+=	build-id
 ${X_}LINKER_FEATURES+=	ifunc
 .endif
+.if ${${X_}LINKER_TYPE} == "bfd" && ${${X_}LINKER_VERSION} > 21750
+${X_}LINKER_FEATURES+=	riscv-relaxations
+.endif
 .if ${${X_}LINKER_TYPE} == "lld" && ${${X_}LINKER_VERSION} >= 60000
 ${X_}LINKER_FEATURES+=	retpoline
 .endif

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Thu Dec  5 19:25:49 2019	(r355427)
+++ head/sys/conf/kern.mk	Thu Dec  5 19:37:30 2019	(r355428)
@@ -144,6 +144,10 @@ CFLAGS+=	-march=rv64imafdc -mabi=lp64
 CFLAGS.clang+=	-mcmodel=medium
 CFLAGS.gcc+=	-mcmodel=medany
 INLINE_LIMIT?=	8000
+
+.if ${LINKER_FEATURES:Mriscv-relaxations} == ""
+CFLAGS+=	-mno-relax
+.endif
 .endif
 
 #


More information about the svn-src-all mailing list