svn commit: r276499 - head/sys/conf

[Dimitry Andric]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20150103/5dfedd3d/attachment.sig>