config.h: Remove the exceptions for cross-compilation builds

This makes it so that the values for MEM_ALIGNBYTES and BYTEORDER
are taken from config.sh, instead of always getting a default.

10 files changed, 15 insertions, 16 deletions

diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 64f9067263..4eefe62238 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1023,7 +1023,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 8
@@ -1092,7 +1092,7 @@
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/Porting/config_H b/Porting/config_H
index 684383840f..59e3f364dc 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -941,7 +941,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 4
@@ -1003,7 +1003,7 @@
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/Porting/config_h.pl b/Porting/config_h.pl
index 0042526b16..82f40d9fa0 100755
--- a/Porting/config_h.pl
+++ b/Porting/config_h.pl
@@ -36,7 +36,6 @@ my %dep = (
     BYTEORDER		=> [ qw( UVSIZE				) ],
     LONGSIZE		=> [ qw( BYTEORDER			) ],
     MULTIARCH		=> [ qw( BYTEORDER MEM_ALIGNBYTES	) ],
-    USE_CROSS_COMPILE	=> [ qw( BYTEORDER MEM_ALIGNBYTES	) ],
     HAS_QUAD		=> [ qw( I64TYPE			) ],
     HAS_GETGROUPS	=> [ qw( Groups_t			) ],
     HAS_SETGROUPS	=> [ qw( Groups_t			) ],
diff --git a/config_h.SH b/config_h.SH
index 071229a09d..8f7a05864c 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -1022,7 +1022,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 5820e9c07b..88d4a34157 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -1013,7 +1013,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 4
@@ -1082,7 +1082,7 @@
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234	/* config-skip */
diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index 2632187b2f..8b41865c13 100644
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -970,7 +970,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 4
@@ -1039,7 +1039,7 @@
  *	so the default case (for NeXT) is big endian to catch them. 
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/uconfig.h b/uconfig.h
index 8e728ab955..79b5aaff98 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -987,7 +987,7 @@
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
@@ -4718,6 +4718,6 @@
 #endif
 
 /* Generated from:
- * 01c6afba563531a39cba7bc09849f8ec6fbe74fe96e3bd2c16e543ec67e2de16 config_h.SH
+ * 4ce7b989417303946dd7101ed52557e157c57900e9dbff6b5799a7b6af48dbd3 config_h.SH
  * 71b0dcf437b30c409fc23b5c4c6ec2c988fc419295a650fe80f93a6d5fb0ff94 uconfig.sh
  * ex: set ro: */
diff --git a/win32/config_H.ce b/win32/config_H.ce
index e7adb973d0..e2837a6002 100644
--- a/win32/config_H.ce
+++ b/win32/config_H.ce
@@ -932,7 +932,7 @@
  *	double, or a long double when applicable. Usual values are 2,
  *	4 and 8. The default is eight, for safety.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  define MEM_ALIGNBYTES 8
 #else
 #define MEM_ALIGNBYTES 8
@@ -1017,7 +1017,7 @@
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 0db52063ce..da310afd6f 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -987,7 +987,7 @@
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
diff --git a/win32/config_H.vc b/win32/config_H.vc
index f55a6d246d..4c1ae3d428 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -987,7 +987,7 @@
  *	so the default case (for NeXT) is big endian to catch them.
  *	This might matter for NeXT 3.0.
  */
-#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
+#if defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
 #    if LONGSIZE == 4
 #      define BYTEORDER 0x1234