Date: Fri, 2 Jan 2015 21:14:38 -0700 From: Warner Losh <imp@bsdimp.com> To: Dimitry Andric <dim@FreeBSD.org> Cc: svn-src-head@freebsd.org, Roman Divacky <rdivacky@FreeBSD.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org Subject: Re: svn commit: r276499 - head/sys/conf Message-ID: <5206DEA5-A5EA-48F3-B653-3E949ABE2EB1@netflix.com> In-Reply-To: <E7CFD2B2-BE2B-494B-97CA-923B474DC782@FreeBSD.org> References: <201501011007.t01A7wYW032884@svn.freebsd.org> <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com> <E7CFD2B2-BE2B-494B-97CA-923B474DC782@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Conditioning on the compiler version is actually rather easy, especially since the number of affected files is so small. It’s an issue when people build the old way on old systems, which is still a lot more popular than you might think. MFC has nothing to do with the problem. Over the years we’ve fixed dozens of bugs like this that prevented people from building on older systems and I’d like to avoid breaking things needlessly. I’m happy to do the work to make this happen, if you’re OK with my backing out these couple of changes. Warner > On Jan 2, 2015, at 1:23 PM, Dimitry Andric <dim@FreeBSD.org> wrote: > > Hm, conditionalizing this on the compiler version is rather ugly. Isn't > this only relevant when we do an MFC? But maybe it is indeed better > to have the same Makefile for different toolchain envronments. > > -Dimitry > >> On 02 Jan 2015, at 18:33, Warner Losh <wlosh@netflix.com> wrote: >> >> This breaks building the kernel with clang 3.4.1 >> >> Warner >> >> >>> On Jan 1, 2015, at 3:07 AM, Roman Divacky <rdivacky@FreeBSD.org> wrote: >>> >>> Author: rdivacky >>> Date: Thu Jan 1 10:07:57 2015 >>> New Revision: 276499 >>> URL: https://svnweb.freebsd.org/changeset/base/276499 >>> >>> Log: >>> LLVM integrated assembler can assemble these files just fine. >>> >>> Modified: >>> head/sys/conf/Makefile.amd64 >>> head/sys/conf/Makefile.i386 >>> head/sys/conf/Makefile.pc98 >>> >>> Modified: head/sys/conf/Makefile.amd64 >>> ============================================================================== >>> --- head/sys/conf/Makefile.amd64 Thu Jan 1 09:33:46 2015 (r276498) >>> +++ head/sys/conf/Makefile.amd64 Thu Jan 1 10:07:57 2015 (r276499) >>> @@ -37,11 +37,6 @@ INCLUDES+= -I$S/contrib/libfdt >>> CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer >>> .endif >>> >>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet >>> -ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS} >>> -ASM_CFLAGS.mpboot.S= ${CLANG_NO_IAS} >>> -ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}} >>> - >>> %BEFORE_DEPEND >>> >>> %OBJS >>> >>> Modified: head/sys/conf/Makefile.i386 >>> ============================================================================== >>> --- head/sys/conf/Makefile.i386 Thu Jan 1 09:33:46 2015 (r276498) >>> +++ head/sys/conf/Makefile.i386 Thu Jan 1 10:07:57 2015 (r276499) >>> @@ -32,11 +32,6 @@ S= ../../.. >>> >>> INCLUDES+= -I$S/contrib/libfdt >>> >>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet >>> -ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS} >>> -ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS} >>> -ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}} >>> - >>> %BEFORE_DEPEND >>> >>> %OBJS >>> >>> Modified: head/sys/conf/Makefile.pc98 >>> ============================================================================== >>> --- head/sys/conf/Makefile.pc98 Thu Jan 1 09:33:46 2015 (r276498) >>> +++ head/sys/conf/Makefile.pc98 Thu Jan 1 10:07:57 2015 (r276499) >>> @@ -30,10 +30,6 @@ S= ../../.. >>> .endif >>> .include "$S/conf/kern.pre.mk" >>> >>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet >>> -ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS} >>> -ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}} >>> - >>> %BEFORE_DEPEND >>> >>> %OBJS >>> >> >> > [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJUp2yuAAoJEGwc0Sh9sBEAF0cQAJRRGeBLvyM+Qx7+fJtLe/VY vPINOav/cB/uXRpii+aEqrd9hOIfVnMKoPPRAtFwN2SIc4wQ0oECWiUXYor7mpya +PnScM/aJvTpA4QhkCP6eOBgUvD3U0E8ISAJj8lMqVMDW5HrlWPs89o2w0c4U1en QKK1rfUqb3opNoDZiF4HIvzRrH6pIk87ZqxMSF/lpQyuWoWdo3o3YYV0or3mxg6b hw3sAvz+Wl9yyOK+0EjifbBtoV5zAVH33gH/nyLWSLHfU0GoPZikO9Nb/EodfteW sUtF7B1O4P+/cwCJKHFCboAozE7JXYrbTfpuFCCT/gGbXmt+qEzgca5XQpI0RAyb /MxOlKpr2bLTebWmQeBGGod2Lp8TUcyNBRvKbk5VRGyiUxqthCg6iGFOGJX99W+G wJmyaSbSNADGyA169laeTA3bHkxfr9ojQl/bvIpr+5ND0Q/aLabA7Z5sHOX/zk3k 61EVyT+mn0nVqHHZ4LsOCk9y7xjPyf3yR6NsqKMZqXl8icAOWHSww5QNR7HvH3C9 FB4sViYn1iozkIH9sxumWrtQAO5gxiwKXZGjx/tDpQdYAds0SD6jabZqXjsfrM/N rxUPR7uD4/GvQNInU0B41UkCSzDNhQnXV2Jeo/xtrK1w2u8o9GCbFG4xUaNSzPH8 cNxhLQxL7vhzvmVIACA7 =G2kz -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5206DEA5-A5EA-48F3-B653-3E949ABE2EB1>