aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-07-17 18:12:08 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-07-17 18:12:08 +0000
commit7250a09527ee141e57142c29b4d3a04fa0477f1f (patch)
tree42db940faea6c4f90a4f08af1497ad78e4b0928c
parent4017abe27c6436d80a08577c6e9ae0e9dc11d7ec (diff)
downloadsrc-7250a09527ee141e57142c29b4d3a04fa0477f1f.tar.gz
src-7250a09527ee141e57142c29b4d3a04fa0477f1f.zip
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
Notes
Notes: svn path=/head/; revision=321080
-rw-r--r--usr.bin/getconf/progenv.gperf4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 481055393b79..20b8fd89160a 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -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