svn commit: r310794 - in head/sys: conf mips/conf
Alexander Kabaev
kan at FreeBSD.org
Fri Dec 30 00:34:54 UTC 2016
Author: kan
Date: Fri Dec 30 00:34:52 2016
New Revision: 310794
URL: https://svnweb.freebsd.org/changeset/base/310794
Log:
Support mips[*]hf variants in config files
Recognize new MACHINE_ARCH names now as we have added hardfloat support.
Switch JZ4780 to mipselhf and remove all uses of TARGET_ARCH in kernel
.mk files.
Reviewed by: adrian
Differential Revision: https://reviews.freebsd.org/D8989
Modified:
head/sys/conf/files.mips
head/sys/conf/kern.mk
head/sys/conf/kern.pre.mk
head/sys/conf/options.mips
head/sys/mips/conf/JZ4780
Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips Thu Dec 29 22:36:16 2016 (r310793)
+++ head/sys/conf/files.mips Fri Dec 30 00:34:52 2016 (r310794)
@@ -52,7 +52,7 @@ kern/kern_clocksource.c standard
kern/link_elf_obj.c standard
kern/subr_busdma_bufalloc.c standard
kern/subr_dummy_vdso_tc.c standard
-kern/subr_sfbuf.c optional mips | mipsel | mipsn32
+kern/subr_sfbuf.c standard
# gcc/clang runtime
libkern/ffsl.c standard
@@ -61,8 +61,8 @@ libkern/fls.c standard
libkern/flsl.c standard
libkern/flsll.c standard
libkern/memmove.c standard
-libkern/cmpdi2.c optional mips | mipsel
-libkern/ucmpdi2.c optional mips | mipsel
+libkern/cmpdi2.c optional mips | mipshf | mipsel | mipselhf
+libkern/ucmpdi2.c optional mips | mipshf | mipsel | mipselhf
libkern/ashldi3.c standard
libkern/ashrdi3.c standard
Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk Thu Dec 29 22:36:16 2016 (r310793)
+++ head/sys/conf/kern.mk Fri Dec 30 00:34:52 2016 (r310794)
@@ -184,7 +184,7 @@ CFLAGS.gcc+= -mcall-aixdesc
.if ${MACHINE_CPUARCH} == "mips"
CFLAGS+= -msoft-float
INLINE_LIMIT?= 8000
-.if ${TARGET_ARCH:Mmips*hf} != ""
+.if ${MACHINE_ARCH:Mmips*hf} != ""
CFLAGS+= -DCPU_HAVEFPU
.endif
.endif
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Thu Dec 29 22:36:16 2016 (r310793)
+++ head/sys/conf/kern.pre.mk Fri Dec 30 00:34:52 2016 (r310794)
@@ -74,7 +74,7 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KE
CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
.if ${MACHINE_CPUARCH} == "mips"
-CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${TARGET_ARCH}"'
+CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${MACHINE_ARCH}"'
.endif
CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips Thu Dec 29 22:36:16 2016 (r310793)
+++ head/sys/conf/options.mips Fri Dec 30 00:34:52 2016 (r310794)
@@ -50,9 +50,13 @@ CPU_MALTA opt_global.h
# which MACHINE_ARCH architecture
MIPS
+MIPSHF
MIPSEL
+MIPSELHF
MIPS64
+MIPS64HF
MIPS64EL
+MIPS64ELHF
MIPSN32
COMPAT_FREEBSD32 opt_compat.h
Modified: head/sys/mips/conf/JZ4780
==============================================================================
--- head/sys/mips/conf/JZ4780 Thu Dec 29 22:36:16 2016 (r310793)
+++ head/sys/mips/conf/JZ4780 Fri Dec 30 00:34:52 2016 (r310794)
@@ -5,7 +5,7 @@
#NO_UNIVERSE
ident JZ4780
-machine mips mipsel
+machine mips mipselhf
cpu CPU_XBURST
cpu CPU_MIPS4KC
More information about the svn-src-all
mailing list