From owner-svn-src-all@freebsd.org  Tue Nov  7 06:28:04 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 5D69CE50187;
 Tue,  7 Nov 2017 06:28:04 +0000 (UTC)
 (envelope-from ngie@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 2DB1764FD9;
 Tue,  7 Nov 2017 06:28:04 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA76QmKZ025928;
 Tue, 7 Nov 2017 06:26:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA76QmnV025927;
 Tue, 7 Nov 2017 06:26:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201711070626.vA76QmnV025927@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 7 Nov 2017 06:26:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325504 - head/lib/libclang_rt
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/lib/libclang_rt
X-SVN-Commit-Revision: 325504
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 06:28:04 -0000

Author: ngie
Date: Tue Nov  7 06:26:48 2017
New Revision: 325504
URL: https://svnweb.freebsd.org/changeset/base/325504

Log:
  Redo r325502
  
  :U:Mfoo expands to :Mfoo, apparently. Explicit check for CPUTYPE being
  defined, and test for it's value not containing *soft* before calling CRTARCH
  armhf.
  
  Tested, somewhat. Unfortunately recent changes appear to have affected
  cross-builds where it no longer works, per my tests after universe12a being
  upgraded from 07/2017 to 11/2017 sources (DESTDIR isn't being used in WORLDTMP;
  MK_SYSTEM_COMPILER might be causing issues right now).
  
  MFC after:	1 week
  MFC with:	r325502
  Reported by:	imp

Modified:
  head/lib/libclang_rt/Makefile.inc

Modified: head/lib/libclang_rt/Makefile.inc
==============================================================================
--- head/lib/libclang_rt/Makefile.inc	Tue Nov  7 05:07:09 2017	(r325503)
+++ head/lib/libclang_rt/Makefile.inc	Tue Nov  7 06:26:48 2017	(r325504)
@@ -3,7 +3,8 @@
 .include <bsd.compiler.mk>
 
 .if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
+    (defined(CPUTYPE) && ${CPUTYPE:M*soft*} == "")
 CRTARCH=	armhf
 .endif
 .endif