Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Jan 2015 21:23:09 +0100
From:      Dimitry Andric <dim@FreeBSD.org>
To:        Warner Losh <wlosh@netflix.com>
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:  <E7CFD2B2-BE2B-494B-97CA-923B474DC782@FreeBSD.org>
In-Reply-To: <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com>
References:  <201501011007.t01A7wYW032884@svn.freebsd.org> <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--Apple-Mail=_EB1095E1-34C5-4036-A3A9-EF5C539A485B
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

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


--Apple-Mail=_EB1095E1-34C5-4036-A3A9-EF5C539A485B
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-----
Version: GnuPG/MacGPG2 v2.0.26

iEYEARECAAYFAlSm/jQACgkQsF6jCi4glqNFjgCg0NI8rl/HwNJK/MB1QvTH9Mbf
/BIAn0UkX9YhUdD6FxNegCSOLiD+gVFP
=RTGU
-----END PGP SIGNATURE-----

--Apple-Mail=_EB1095E1-34C5-4036-A3A9-EF5C539A485B--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E7CFD2B2-BE2B-494B-97CA-923B474DC782>