From owner-svn-src-all@freebsd.org  Tue Nov  7 09:48:21 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9950CE54035;
 Tue,  7 Nov 2017 09:48:21 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org [96.47.72.37])
 (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 691FB74D08;
 Tue,  7 Nov 2017 09:48:21 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA79l501003997;
 Tue, 7 Nov 2017 09:47:05 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA79l5Er003996;
 Tue, 7 Nov 2017 09:47:05 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711070947.vA79l5Er003996@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 7 Nov 2017 09:47:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325508 - head/lib/libclang_rt
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/lib/libclang_rt
X-SVN-Commit-Revision: 325508
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Nov 2017 09:48:21 -0000

Author: imp
Date: Tue Nov  7 09:47:05 2017
New Revision: 325508
URL: https://svnweb.freebsd.org/changeset/base/325508

Log:
  Correct the detection of hard float arm
  
  * Don't test MACHINE, it's irrelevant to userland and should never be
    used in userland Makefiles.
  * If we match armv[67] and CPUTYPE is undefined OR it doesn't have
    'soft' in it, choose armhf.
  * Add a note that the soft float on armv[67] may be broken.
  
  Sponsored by: Netflix

Modified:
  head/lib/libclang_rt/Makefile.inc

Modified: head/lib/libclang_rt/Makefile.inc
==============================================================================
--- head/lib/libclang_rt/Makefile.inc	Tue Nov  7 09:46:26 2017	(r325507)
+++ head/lib/libclang_rt/Makefile.inc	Tue Nov  7 09:47:05 2017	(r325508)
@@ -2,11 +2,11 @@
 
 .include <bsd.compiler.mk>
 
-.if ${MACHINE} == "arm"
+# armv[67] is a bit special since we allow a soft-floating version via
+# CPUTYPE matching *soft*. This variant is may not actually work though.
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
-    (defined(CPUTYPE) && ${CPUTYPE:M*soft*} == "")
+    (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 CRTARCH=	armhf
-.endif
 .endif
 CRTARCH?=	${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt