4 files changed, 6 insertions, 18 deletions
diff --git a/vos/config.alpha.def b/vos/config.alpha.def
index 0fb92e3e91..5d437d85a6 100644
--- a/vos/config.alpha.def
+++ b/vos/config.alpha.def
@@ -15,7 +15,6 @@ $cpplast='-'
 $cppminus='-'
 $cpprun='cc -E -'
 $cppstdin='cc -E'
-$crosscompile='undef'
 $d_Gconvert='sprintf((b),"%.*g",(n),(x))'
 $d_PRIeldbl='define'
 $d_PRIfldbl='define'
@@ -503,6 +502,7 @@ $uquadtype='_error_'
 $use5005threads='undef'
 $use64bitall='undef'
 $use64bitint='undef'
+$usecrosscompile='undef'
 $usedl='undef'
 $useithreads='undef'
 $uselargefiles='undef'
diff --git a/vos/config.alpha.h b/vos/config.alpha.h
index 1b560b40bd..f610d327eb 100644
--- a/vos/config.alpha.h
+++ b/vos/config.alpha.h
@@ -962,12 +962,6 @@
  */
 #define SH_PATH "/bin/sh"  /**/
 
-/* CROSSCOMPILE:
- *	This symbol, if defined, signifies that we our
- *	build process is a cross-compilation.
- */
-/*#define CROSSCOMPILE		/**/
-
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
  *	preprocessor can make decisions based on it.
@@ -1051,7 +1045,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 8
@@ -1128,7 +1122,7 @@
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/vos/config.ga.def b/vos/config.ga.def
index ffcd3cf814..7ad9bd0a8e 100644
--- a/vos/config.ga.def
+++ b/vos/config.ga.def
@@ -15,7 +15,6 @@ $cpplast='-'
 $cppminus='-'
 $cpprun='cc -E -'
 $cppstdin='cc -E'
-$crosscompile='undef'
 $d_Gconvert='sprintf((b),"%.*g",(n),(x))'
 $d_PRIeldbl='define'
 $d_PRIfldbl='define'
@@ -503,6 +502,7 @@ $uquadtype='_error_'
 $use5005threads='undef'
 $use64bitall='undef'
 $use64bitint='undef'
+$usecrosscompile='undef'
 $usedl='undef'
 $useithreads='undef'
 $uselargefiles='undef'
diff --git a/vos/config.ga.h b/vos/config.ga.h
index 7afd9a30f9..791d9374ee 100644
--- a/vos/config.ga.h
+++ b/vos/config.ga.h
@@ -962,12 +962,6 @@
  */
 #define SH_PATH "/system/gnu_library/bin/bash.pm"  /**/
 
-/* CROSSCOMPILE:
- *	This symbol, if defined, signifies that we our
- *	build process is a cross-compilation.
- */
-/*#define CROSSCOMPILE		/**/
-
 /* INTSIZE:
  *	This symbol contains the value of sizeof(int) so that the C
  *	preprocessor can make decisions based on it.
@@ -1051,7 +1045,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 8
@@ -1128,7 +1122,7 @@
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(CROSSCOMPILE) || defined(MULTIARCH)
+#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234