From owner-svn-src-head@FreeBSD.ORG  Wed Oct  1 12:47:27 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 F164F89B;
 Wed,  1 Oct 2014 12:47:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DE4F2F51;
 Wed,  1 Oct 2014 12:47:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s91ClQMm069645;
 Wed, 1 Oct 2014 12:47:26 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s91ClQqd069643;
 Wed, 1 Oct 2014 12:47:26 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201410011247.s91ClQqd069643@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 1 Oct 2014 12:47:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272357 - in head: . lib/clang
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2014 12:47:27 -0000

Author: andrew
Date: Wed Oct  1 12:47:25 2014
New Revision: 272357
URL: https://svnweb.freebsd.org/changeset/base/272357

Log:
  Fix the TARGET_ABI value clang uses. It shpuld be gnueabi on all ARM
  soft-float architectures, and gnueabihf for hard-float.

Modified:
  head/Makefile.inc1
  head/lib/clang/clang.build.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Oct  1 12:44:16 2014	(r272356)
+++ head/Makefile.inc1	Wed Oct  1 12:47:25 2014	(r272357)
@@ -337,10 +337,10 @@ XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 XFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
-.if ${TARGET_ARCH:M*eb*} == ""
-TARGET_ABI=	gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET_ARCH:M*hf*} != ""
 TARGET_ABI=	gnueabihf
+.else
+TARGET_ABI=	gnueabi
 .endif
 .endif
 TARGET_ABI?=	unknown

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Wed Oct  1 12:44:16 2014	(r272356)
+++ head/lib/clang/clang.build.mk	Wed Oct  1 12:47:25 2014	(r272357)
@@ -22,10 +22,10 @@ CFLAGS+=	-fno-strict-aliasing
 TARGET_ARCH?=	${MACHINE_ARCH}
 BUILD_ARCH?=	${MACHINE_ARCH}
 
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6")
-TARGET_ABI=	gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET_ARCH:Marm*hf*} != ""
 TARGET_ABI=	gnueabihf
+.elif ${TARGET_ARCH:Marm*} != ""
+TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif