Date: Tue, 31 Jan 2017 02:26:21 -0800 From: Mark Millard <markmi@dsl-only.net> To: Justin Hibbits <chmeeedalf@gmail.com>, svn-src-head@freebsd.org Subject: Re: svn commit: r313005 - in head/sys: conf modules/zfs Message-ID: <676ECF89-F9AE-436A-942A-003B76C6BFE2@dsl-only.net>
next in thread | raw e-mail | index | archive | help
> 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 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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?=3D 8000 > # Also explicitly disable Altivec instructions inside the kernel. > # > .if ${MACHINE_CPUARCH} =3D=3D "powerpc" > -CFLAGS+=3D -mno-altivec > -CFLAGS.clang+=3D -mllvm -disable-ppc-float-in-variadic=3Dtrue > -CFLAGS.gcc+=3D -msoft-float > +CFLAGS+=3D -mno-altivec -msoft-float > INLINE_LIMIT?=3D 15000 > .endif =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/conf/kern.mk (revision 312982) +++ sys/conf/kern.mk (working copy) @@ -162,7 +162,11 @@ # .if ${MACHINE_CPUARCH} =3D=3D "powerpc" CFLAGS+=3D -mno-altivec +.if ${COMPILER_TYPE} =3D=3D "clang" && ${COMPILER_VERSION} < 30800 CFLAGS.clang+=3D -mllvm -disable-ppc-float-in-variadic=3Dtrue +.else +CFLAGS.clang+=3D -msoft-float +.endif CFLAGS.gcc+=3D -msoft-float INLINE_LIMIT?=3D 15000 .endif In other words: I tried to span older clang's as well. (Not that you should.) > .if ${MACHINE_ARCH} =3D=3D "powerpcspe" > -CFLAGS+=3D -mno-spe > +CFLAGS.gcc+=3D -mno-spe > .endif > =20 > # I had nothing for powerpcspe . > Modified: head/sys/modules/zfs/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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+=3D-I${SUNW}/common > CFLAGS+=3D-DBUILDING_ZFS > =20 > .if ${MACHINE_ARCH} =3D=3D "powerpc64" > -CFLAGS+=3D-mminimal-toc > +CFLAGS.gcc+=3D-mminimal-toc > .endif > =20 > .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. =3D=3D=3D Mark Millard markmi at dsl-only.net
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?676ECF89-F9AE-436A-942A-003B76C6BFE2>