From owner-svn-src-all@FreeBSD.ORG Fri Jan 2 20:23:21 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCCFFFE4; Fri, 2 Jan 2015 20:23:20 +0000 (UTC) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "tensor.andric.com", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 84BE32D7D; Fri, 2 Jan 2015 20:23:20 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::fd7c:bcc2:17c:e893] (unknown [IPv6:2001:7b8:3a7:0:fd7c:bcc2:17c:e893]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 7BCB9B80A; Fri, 2 Jan 2015 21:23:16 +0100 (CET) Subject: Re: svn commit: r276499 - head/sys/conf Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Content-Type: multipart/signed; boundary="Apple-Mail=_EB1095E1-34C5-4036-A3A9-EF5C539A485B"; protocol="application/pgp-signature"; micalg=pgp-sha1 X-Pgp-Agent: GPGMail 2.5b4 From: Dimitry Andric In-Reply-To: <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com> Date: Fri, 2 Jan 2015 21:23:09 +0100 Message-Id: References: <201501011007.t01A7wYW032884@svn.freebsd.org> <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com> To: Warner Losh X-Mailer: Apple Mail (2.1993) Cc: svn-src-head@freebsd.org, Roman Divacky , src-committers , svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2015 20:23:21 -0000 --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 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 = 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--