diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2019-12-05 19:37:30 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2019-12-05 19:37:30 +0000 |
| commit | 0869dceb9d2642defe8d34b09d65145cb3f81e09 (patch) | |
| tree | ba66356a05110af729826b65e357488b24384bcc /share | |
| parent | 1bef4955bcf5356910be77622e9e352399d38557 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=355428
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.cpu.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.linker.mk | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index b5d0453c2ed2..c5536222ac8a 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -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 diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index 16a8e8c4f78e..68419982882f 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -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 |