Skip site navigation (1)Skip section navigation (2)
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

--Apple-Mail=_1BC221AF-D4D6-47E4-854A-8197EB7222B2
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

Conditioning on the compiler version is actually rather easy,
especially since the number of affected files is so small.
It=E2=80=99s 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=E2=80=99ve fixed dozens of =
bugs
like this that prevented people from building on older systems and
I=E2=80=99d like to avoid breaking things needlessly.

I=E2=80=99m happy to do the work to make this happen, if you=E2=80=99re =
OK with my
backing out these couple of changes.

Warner


> On Jan 2, 2015, at 1:23 PM, Dimitry Andric <dim@FreeBSD.org> wrote:
>=20
> 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.
>=20
> -Dimitry
>=20
>> On 02 Jan 2015, at 18:33, Warner Losh <wlosh@netflix.com> wrote:
>>=20
>> This breaks building the kernel with clang 3.4.1
>>=20
>> Warner
>>=20
>>=20
>>> On Jan 1, 2015, at 3:07 AM, Roman Divacky <rdivacky@FreeBSD.org> =
wrote:
>>>=20
>>> Author: rdivacky
>>> Date: Thu Jan  1 10:07:57 2015
>>> New Revision: 276499
>>> URL: https://svnweb.freebsd.org/changeset/base/276499
>>>=20
>>> Log:
>>> LLVM integrated assembler can assemble these files just fine.
>>>=20
>>> Modified:
>>> head/sys/conf/Makefile.amd64
>>> head/sys/conf/Makefile.i386
>>> head/sys/conf/Makefile.pc98
>>>=20
>>> Modified: head/sys/conf/Makefile.amd64
>>> =
=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/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+=3D -I$S/contrib/libfdt
>>> CFLAGS+=3D	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
>>> .endif
>>>=20
>>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet
>>> -ASM_CFLAGS.acpi_wakecode.S=3D	${CLANG_NO_IAS}
>>> -ASM_CFLAGS.mpboot.S=3D		${CLANG_NO_IAS}
>>> -ASM_CFLAGS+=3D			${ASM_CFLAGS.${.IMPSRC:T}}
>>> -
>>> %BEFORE_DEPEND
>>>=20
>>> %OBJS
>>>=20
>>> Modified: head/sys/conf/Makefile.i386
>>> =
=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/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=3D	../../..
>>>=20
>>> INCLUDES+=3D -I$S/contrib/libfdt
>>>=20
>>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet
>>> -ASM_CFLAGS.acpi_wakecode.S=3D	${CLANG_NO_IAS}
>>> -ASM_CFLAGS.mpboot.s=3D		${CLANG_NO_IAS}
>>> -ASM_CFLAGS+=3D			${ASM_CFLAGS.${.IMPSRC:T}}
>>> -
>>> %BEFORE_DEPEND
>>>=20
>>> %OBJS
>>>=20
>>> Modified: head/sys/conf/Makefile.pc98
>>> =
=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/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=3D	../../..
>>> .endif
>>> .include "$S/conf/kern.pre.mk"
>>>=20
>>> -# XXX: clang integrated-as doesn't grok .codeNN directives yet
>>> -ASM_CFLAGS.mpboot.s=3D		${CLANG_NO_IAS}
>>> -ASM_CFLAGS+=3D			${ASM_CFLAGS.${.IMPSRC:T}}
>>> -
>>> %BEFORE_DEPEND
>>>=20
>>> %OBJS
>>>=20
>>=20
>>=20
>=20


--Apple-Mail=_1BC221AF-D4D6-47E4-854A-8197EB7222B2
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail

-----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-----

--Apple-Mail=_1BC221AF-D4D6-47E4-854A-8197EB7222B2--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5206DEA5-A5EA-48F3-B653-3E949ABE2EB1>