svn commit: r313005 - in head/sys: conf modules/zfs

Mark Millard markmi at dsl-only.net
Tue Jan 31 10:26:30 UTC 2017


> Author: jhibbits
> Date: Tue Jan 31 01:55:29 2017
> New Revision: 313005
> URL: https://svnweb.freebsd.org/changeset/base/313005
> . . .
> Modified: head/sys/conf/kern.mk
> ==============================================================================
> --- head/sys/conf/kern.mk	Tue Jan 31 01:48:55 2017	(r313004)
> +++ head/sys/conf/kern.mk	Tue Jan 31 01:55:29 2017	(r313005)
> @@ -161,14 +161,12 @@ INLINE_LIMIT?=	8000
>  # Also explicitly disable Altivec instructions inside the kernel.
>  #
>  .if ${MACHINE_CPUARCH} == "powerpc"
> -CFLAGS+=	-mno-altivec
> -CFLAGS.clang+=	-mllvm -disable-ppc-float-in-variadic=true
> -CFLAGS.gcc+=	-msoft-float
> +CFLAGS+=	-mno-altivec -msoft-float
>  INLINE_LIMIT?=	15000
>  .endif
 
Looks like I never submitted it to bugzilla but my old
variant of the above was:

# svnlite diff sys/conf/kern.mk
Index: sys/conf/kern.mk
===================================================================
--- sys/conf/kern.mk    (revision 312982)
+++ sys/conf/kern.mk    (working copy)
@@ -162,7 +162,11 @@
 #
 .if ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=       -mno-altivec
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30800
 CFLAGS.clang+= -mllvm -disable-ppc-float-in-variadic=true
+.else
+CFLAGS.clang+= -msoft-float
+.endif
 CFLAGS.gcc+=   -msoft-float
 INLINE_LIMIT?= 15000
 .endif

In other words: I tried to span older clang's as well.
(Not that you should.)

>  .if ${MACHINE_ARCH} == "powerpcspe"
> -CFLAGS+=	-mno-spe
> +CFLAGS.gcc+=	-mno-spe
>  .endif
>  
>  #

I had nothing for powerpcspe .

> Modified: head/sys/modules/zfs/Makefile
> ==============================================================================
> --- head/sys/modules/zfs/Makefile	Tue Jan 31 01:48:55 2017	(r313004)
> +++ head/sys/modules/zfs/Makefile	Tue Jan 31 01:55:29 2017	(r313005)
> @@ -94,7 +94,7 @@ CFLAGS+=-I${SUNW}/common
>  CFLAGS+=-DBUILDING_ZFS
>  
>  .if ${MACHINE_ARCH} == "powerpc64"
> -CFLAGS+=-mminimal-toc
> +CFLAGS.gcc+=-mminimal-toc
>  .endif
>  
>  .ifdef ZFS_DEBUG

You may want to process my bugzilla 215107 with head/sys/modules/zfs/Makefile
as it also deals with that -mminimal-toc: in other words to declare 215107
fixed by this update.

===
Mark Millard
markmi at dsl-only.net



More information about the svn-src-head mailing list