From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 25 Aug 2003 15:45:51 +0000 (+0000)
Subject: UVSIZE is not yet defined when it would be needed
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=050a890dfac58c5fb0e87881b6731a50e42b72bc;p=p5sagit%2Fp5-mst-13.2.git

UVSIZE is not yet defined when it would be needed
by MULTIARCH.  So go back to LONGSIZE, and (belt-
and-suspenders-and-rope style) later in UVSIZE
possibly redefine BYTEORDER.

p4raw-id: //depot/perl@20881
---

diff --git a/Configure b/Configure
index 1ca1b00..b992563 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Sat Aug 23 13:26:16 EEST 2003 [metaconfig 3.0 PL70]
+# Generated on Mon Aug 25 19:47:58 EEST 2003 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
diff --git a/config_h.SH b/config_h.SH
index 96c7d06..a40ec44 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -987,19 +987,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
-#    if UVSIZE == 4
+#    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
 #    else
-#      if UVSIZE == 8
+#      if LONGSIZE == 8
 #        define BYTEORDER 0x12345678
 #      endif
 #    endif
 #  else
 #    ifdef __BIG_ENDIAN__
-#      if UVSIZE == 4
+#      if LONGSIZE == 4
 #        define BYTEORDER 0x4321
 #      else
-#        if UVSIZE == 8
+#        if LONGSIZE == 8
 #          define BYTEORDER 0x87654321
 #        endif
 #      endif
@@ -3228,6 +3228,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define	NVSIZE		$nvsize		/**/
 #$d_nv_preserves_uv	NV_PRESERVES_UV
 #define	NV_PRESERVES_UV_BITS	$nv_preserves_uv_bits
+#if UVSIZE == 8
+#   ifdef BYTEORDER
+#       if BYTEORDER == 0x1234
+#           undef BYTEORDER
+#           define BYTEORDER 0x12345678
+#       else
+#           if BYTEORDER == 0x4321
+#               undef BYTEORDER
+#               define BYTEORDER 0x87654321
+#           endif
+#       endif
+#   endif
+#endif
 
 /* IVdf:
  *	This symbol defines the format string used for printing a Perl IV