From owner-svn-src-all@FreeBSD.ORG  Thu Mar 12 08:32:25 2015
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 8E3F1C7D;
 Thu, 12 Mar 2015 08:32:25 +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 7A3A619A;
 Thu, 12 Mar 2015 08:32:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2C8WPSc057248;
 Thu, 12 Mar 2015 08:32:25 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2C8WP9H057247;
 Thu, 12 Mar 2015 08:32:25 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201503120832.t2C8WP9H057247@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 12 Mar 2015 08:32:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279907 - head/usr.bin/xlint
X-SVN-Group: head
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.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: Thu, 12 Mar 2015 08:32:25 -0000

Author: imp
Date: Thu Mar 12 08:32:24 2015
New Revision: 279907
URL: https://svnweb.freebsd.org/changeset/base/279907

Log:
  TARGET_* shouldn't be used here. Use MACHINE_* instead.

Modified:
  head/usr.bin/xlint/Makefile.inc

Modified: head/usr.bin/xlint/Makefile.inc
==============================================================================
--- head/usr.bin/xlint/Makefile.inc	Thu Mar 12 08:32:22 2015	(r279906)
+++ head/usr.bin/xlint/Makefile.inc	Thu Mar 12 08:32:24 2015	(r279907)
@@ -5,18 +5,10 @@ WARNS?=		0
 
 .PATH:		${.CURDIR}/../common
 
-# These assignments duplicate much of the functionality of
-# MACHINE_CPUARCH, but there's no easy way to export make functions...
-.if defined(TARGET_ARCH)
-TARGET_CPUARCH=	${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/}
+.if exists(${.CURDIR}/../arch/${MACHINE_ARCH})
+CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_ARCH}
 .else
-TARGET_CPUARCH=	${MACHINE_CPUARCH}
-TARGET_ARCH=	${MACHINE_ARCH}
-.endif
-.if exists(${.CURDIR}/../arch/${TARGET_ARCH})
-CFLAGS+=	-I${.CURDIR}/../arch/${TARGET_ARCH}
-.else
-CFLAGS+=	-I${.CURDIR}/../arch/${TARGET_CPUARCH}
+CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_CPUARCH}
 .endif
 CFLAGS+=	-I${.CURDIR}/../common