From owner-svn-src-head@freebsd.org  Mon Jul 17 18:12:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 24A28D9CCA9;
 Mon, 17 Jul 2017 18:12:10 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DE4A66AC32;
 Mon, 17 Jul 2017 18:12:09 +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 v6HIC9eE082060;
 Mon, 17 Jul 2017 18:12:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HIC9Cq082059;
 Mon, 17 Jul 2017 18:12:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707171812.v6HIC9Cq082059@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: Mon, 17 Jul 2017 18:12:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321080 - head/usr.bin/getconf
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/usr.bin/getconf
X-SVN-Commit-Revision: 321080
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2017 18:12:10 -0000

Author: ngie
Date: Mon Jul 17 18:12:08 2017
New Revision: 321080
URL: https://svnweb.freebsd.org/changeset/base/321080

Log:
  Expose the ILP32/LP64 programming environments based on
  __ILP32__/__LP64__ instead of by architecture.
  
  The list was incomplete (previous commits purged invalid architectures,
  like __alpha__, but failed to add new ones). It's best to base the symbol
  presence on whether or not the architecture is ILP32 / LP64 capable, per
  the compiler.
  
  This fixes the ILP32/LP64 program environments on some architectures like
  arm64, and by proxy fixes the tests on those architectures.
  
  MFC after:	1 month
  Reviewed by:	no one (timed out on feedback from imp)
  Differential Revision:	D10787

Modified:
  head/usr.bin/getconf/progenv.gperf

Modified: head/usr.bin/getconf/progenv.gperf
==============================================================================
--- head/usr.bin/getconf/progenv.gperf	Mon Jul 17 18:07:53 2017	(r321079)
+++ head/usr.bin/getconf/progenv.gperf	Mon Jul 17 18:12:08 2017	(r321080)
@@ -30,11 +30,11 @@ static const struct map *in_word_set(const char *str);
  * be updated.  (We cheat here and define the supported environments
  * statically.)
  */
-#if defined(__sparc64__) || defined(__amd64__)
+#ifdef	__LP64__
 #define	have_LP64_OFF64		NULL
 #endif
 
-#if defined(__i386__) || defined(__powerpc__)
+#ifdef	__ILP32__
 #define	have_ILP32_OFFBIG	NULL
 #endif