Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Jan 2015 21:36:39 -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:  <874E0C45-9FC9-4F19-8741-2D68F5928899@bsdimp.com>
In-Reply-To: <729C40E4-B73A-41D5-9EBF-F5F776CBF0D0@FreeBSD.org>
References:  <201501011007.t01A7wYW032884@svn.freebsd.org> <41CF0351-83A3-4D54-B308-32F310DCD3DA@gmail.com> <E7CFD2B2-BE2B-494B-97CA-923B474DC782@FreeBSD.org> <5206DEA5-A5EA-48F3-B653-3E949ABE2EB1@netflix.com> <729C40E4-B73A-41D5-9EBF-F5F776CBF0D0@FreeBSD.org>

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

[-- Attachment #1 --]
I’ll back them out in one commit, and commit the fix in the next, so there
will be a one commit window.

Warner


> On Jan 2, 2015, at 9:23 PM, Dimitry Andric <dim@FreeBSD.org> wrote:
> 
> Sure, I don't have any problem with backing this out for now.  For clang
> 3.5.0 users, it should not matter too much that GNU as is run for just a
> few files.
> 
> -Dimitry
> 
>> On 03 Jan 2015, at 05:14, Warner Losh <imp@bsdimp.com> wrote:
>> 
>> 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

iQIcBAEBCgAGBQJUp3HYAAoJEGwc0Sh9sBEAWAEQANAtOv0y0N5HDvA7qJhp3uHH
p1ranZkI5QRU8qrv8bO1wvdKjE0UIe054oQ3Be0j9ie6ChaT3rAo0W4AsQluLJEA
1XYztozT7LtFM3cMc6ej2C8TihYmMxTel4H2NyEwp/Ldq5UCFxAMnJT1rkQS9hvI
EP8c1rNKfLCKOw82Wv/4WGiemQd+zjwuTIchbK3mYlPVr/lLs+lgWBQvjk75sdNU
cJFX+JCT72bZ1nznAHDQA5e9ssjjmnvS/8a+1R2+EBWQ/yDWsyZ4etWjxLw5XcW6
s9YA/EkMhUI4K7PB6XA8QH8+Ek/Yb04YFkRVg4whUvrEIyNnicZjecjzxCjypevS
Vl2o8ms+p7ceofyzkEyfB6SCvdhMd98woyisf0MpvzECL4pdUoQ33ZpabWHSj63H
czNa6QF18O27Td5rQJDv8liGJiQYc/+rb+dH8W9CpmENvwy6U4NJj2bcMyxXDgKv
DAGhgx37JMOuigNkP9GHC4H1n5TEBVS14tSNZiAGvD3CLeH1gDd2aaezWHfzIPJU
oAM0+rR3wV3xHbAntPiDwUW2MctAOIl0tFrUD1IrmM44YFtc7ApNcduhL6XONkbw
bXJsPBXae41HFu1ZjTkSgD4I0PW+CqvIo0xPOBcQLcyysi/tf4AhTDK0MdHustWJ
17PDNAgigtabGx5rZjxU
=umr1
-----END PGP SIGNATURE-----

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?874E0C45-9FC9-4F19-8741-2D68F5928899>