Index: usr.bin/getconf/progenv.gperf
===================================================================
--- usr.bin/getconf/progenv.gperf
+++ usr.bin/getconf/progenv.gperf
@@ -30,11 +30,11 @@
  * 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