svn commit: r336716 - in head: share/mk stand sys/conf

[Ruslan Bukin]

Author: br
Date: Wed Jul 25 16:07:35 2018
New Revision: 336716
URL: https://svnweb.freebsd.org/changeset/base/336716

Log:
  Disable 'C'-compressed ISA extension.
  
  It works excellent, but KDB disassembler and DTrace FBT provider for
  RISC-V do lack support for it. They currently handle 4-byte instructions
  only, while C-compressed ISA extension introduces 2-byte instructions
  freely mixing them together.
  
  So disable it for now.
  
  Reviewed by:	markj@
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D16436

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

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Wed Jul 25 16:00:48 2018	(r336715)
+++ head/share/mk/bsd.cpu.mk	Wed Jul 25 16:07:35 2018	(r336716)
@@ -367,9 +367,9 @@ CFLAGS += -mcpu=8540 -Wa,-me500 -mspe=yes -mabi=spe -m
 
 .if ${MACHINE_CPUARCH} == "riscv"
 .if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS += -march=rv64imac -mabi=lp64
+CFLAGS += -march=rv64ima -mabi=lp64
 .else
-CFLAGS += -march=rv64imafdc -mabi=lp64d
+CFLAGS += -march=rv64imafd -mabi=lp64d
 .endif
 .endif
 

Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk	Wed Jul 25 16:00:48 2018	(r336715)
+++ head/stand/defs.mk	Wed Jul 25 16:07:35 2018	(r336716)
@@ -103,7 +103,7 @@ CFLAGS+=	-ffreestanding ${CFLAGS_NO_SIMD}
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only -fPIC
 .elif ${MACHINE_CPUARCH} == "riscv"
-CFLAGS+=	-march=rv64imac -mabi=lp64
+CFLAGS+=	-march=rv64ima -mabi=lp64
 .else
 CFLAGS+=	-msoft-float
 .endif

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Wed Jul 25 16:00:48 2018	(r336715)
+++ head/sys/conf/kern.mk	Wed Jul 25 16:07:35 2018	(r336716)
@@ -131,7 +131,7 @@ INLINE_LIMIT?=	8000
 .endif
 
 .if ${MACHINE_CPUARCH} == "riscv"
-CFLAGS.gcc+=	-mcmodel=medany -march=rv64imafdc -mabi=lp64
+CFLAGS.gcc+=	-mcmodel=medany -march=rv64imafd -mabi=lp64
 INLINE_LIMIT?=	8000
 .endif