From owner-svn-src-all@FreeBSD.ORG  Sat Dec  6 19:35:47 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AC830E97;
 Sat,  6 Dec 2014 19:35:47 +0000 (UTC)
Received: from nibbler.fubar.geek.nz (nibbler.fubar.geek.nz [199.48.134.198])
 by mx1.freebsd.org (Postfix) with ESMTP id 8E5998D4;
 Sat,  6 Dec 2014 19:35:47 +0000 (UTC)
Received: from bender.lan (97e078e7.skybroadband.com [151.224.120.231])
 by nibbler.fubar.geek.nz (Postfix) with ESMTPSA id 0923D7328F;
 Sat,  6 Dec 2014 19:35:39 +0000 (UTC)
Date: Sat, 6 Dec 2014 19:35:31 +0000
From: Andrew Turner <andrew@fubar.geek.nz>
To: Dimitry Andric <dim@FreeBSD.org>
Subject: Re: svn commit: r275564 - head/sys/arm/arm
Message-ID: <20141206193531.73875d39@bender.lan>
In-Reply-To: <078F2487-9D4D-435C-92CC-C0E3EC7A34AE@FreeBSD.org>
References: <201412061159.sB6BxZOV054978@svn.freebsd.org>
 <078F2487-9D4D-435C-92CC-C0E3EC7A34AE@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Dec 2014 19:35:47 -0000

On Sat, 6 Dec 2014 16:15:55 +0100
Dimitry Andric <dim@FreeBSD.org> wrote:

> On 06 Dec 2014, at 12:59, Andrew Turner <andrew@FreeBSD.org> wrote:
> > 
> > Author: andrew
> > Date: Sat Dec  6 11:59:35 2014
> > New Revision: 275564
> > URL: https://svnweb.freebsd.org/changeset/base/275564
> > 
> > Log:
> >  Use the unified syntax when generating assembly for clang. The
> > clang 3.5 integrated assembler only accepts it.
> > 
> >  MFC after:	1 week
> >  Sponsored by:	ABT Systems Ltd
> > 
> > Modified:
> >  head/sys/arm/arm/stdatomic.c
> > 
> > Modified: head/sys/arm/arm/stdatomic.c
> > ==============================================================================
> > --- head/sys/arm/arm/stdatomic.c	Sat Dec  6 10:05:07
> > 2014	(r275563) +++ head/sys/arm/arm/stdatomic.c	Sat
> > Dec  6 11:59:35 2014	(r275564) @@ -850,8 +850,13 @@
> > EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str EMIT_FETCH_AND_OP_N(N,
> > uintN_t, ldr, str, fetch_and_sub, "sub")		\
> > EMIT_FETCH_AND_OP_N(N, uintN_t, ldr, str, fetch_and_xor, "eor")
> > 
> > +#ifdef __clang__
> > +EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "strbeq")
> > +EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "strheq")
> > +#else
> > EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb", "streqb")
> > EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh")
> > +#endif
> > EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq")
> 
> I already had this change in the clang350-import project branch, but
> unconditional.  Should we just not standardize on the unified syntax,
> so all these ifdefs can be avoided?

Unfortunately gcc 4.2 doesn't produce unified syntax so we need to have
both here. Without this the armeb build failed for me.

Andrew