Scratch #3008 and introduce $crosscompile and $multiarch

also in non-Configure lands.

p4raw-id: //depot/cfgperl@3009

11 files changed, 53 insertions, 4 deletions

diff --git a/Configure b/Configure
index dd46fb8287..31ce6cb5fc 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 Mon Feb 22 10:52:12 EET 1999 [metaconfig 3.0 PL70]
+# Generated on Mon Feb 22 11:10:33 EET 1999 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -10287,6 +10287,9 @@ case "$crosscompile" in
 ''|[nN]*) crosscompile="$undef" ;;
 esac
 
+case "$osname" in
+next) multiarch="$define" ;;
+esac
 case "$multiarch" in
 ''|[nN]*) multiarch="$undef" ;;
 esac
diff --git a/hints/next_3.sh b/hints/next_3.sh
index 7f989c9125..1a174b8d54 100644
--- a/hints/next_3.sh
+++ b/hints/next_3.sh
@@ -47,7 +47,7 @@
 # use the following two lines if you have perl5.003_22 or better and
 # do not encounter intermittent core dumps.
 
-ccflags='-DUSE_NEXT_CTYPE -DMULTIARCH'
+ccflags='-DUSE_NEXT_CTYPE'
 usemymalloc='n'
 
 ######################################################################
diff --git a/hints/next_3_0.sh b/hints/next_3_0.sh
index 3384f76e75..b8cc2c2d90 100644
--- a/hints/next_3_0.sh
+++ b/hints/next_3_0.sh
@@ -16,7 +16,7 @@ echo find it.  By default, it is placed in /usr/local/include/gdbm.h.	>&4
 echo It will not be found there.  Try moving it to			>&4
 echo /NextDeveloper/Headers/bsd/gdbm.h.					>&4
 
-ccflags='-DUSE_NEXT_CTYPE -DNEXT30_NO_ATTRIBUTE -DMULTIARCH'
+ccflags='-DUSE_NEXT_CTYPE -DNEXT30_NO_ATTRIBUTE'
 POSIX_cflags='ccflags="-posix $ccflags"'
 useposix='undef'
 ldflags='-u libsys_s'
diff --git a/hints/next_4.sh b/hints/next_4.sh
index 7b9d289498..8bc623a9e4 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -18,7 +18,7 @@ libc='/NextLibrary/Frameworks/System.framework/System'
 
 ldflags='-dynamic -prebind'
 lddlflags='-dynamic -bundle -undefined suppress'
-ccflags='-dynamic -fno-common -DUSE_NEXT_CTYPE -DUSE_PERL_SBRK -DMULTIARCH'
+ccflags='-dynamic -fno-common -DUSE_NEXT_CTYPE -DUSE_PERL_SBRK'
 cccdlflags='none'
 ld='cc'
 #optimize='-g -O'
diff --git a/vms/subconfigure.com b/vms/subconfigure.com
index ab5fdfb108..2ea56675c6 100644
--- a/vms/subconfigure.com
+++ b/vms/subconfigure.com
@@ -62,6 +62,8 @@ $ myname = myhostname
 $ if "''myname'" .eqs. "" THEN myname = f$trnlnm("SYS$NODE")
 $!
 $! ##ADD NEW CONSTANTS HERE##
+$ perl_multiarch="undef"
+$ perl_crosscompile="undef"
 $ perl_d_madvise="undef"
 $ perl_d_msync="undef"
 $ perl_d_mprotect="undef"
@@ -3082,6 +3084,8 @@ $ WC "d_mprotect='" + perl_d_mprotect + "'"
 $ WC "d_munmap='" + perl_d_munmap + "'"
 $ WC "d_mmap='" + perl_d_mmap + "'"
 $ WC "i_sysmman='" + perl_i_sysmman + "'"
+$ WC "multiarch='" + perl_multiarch + "'"
+$ WC "crosscompile='" + perl_crosscompile + "'"
 $!
 $! ##WRITE NEW CONSTANTS HERE##
 $!
diff --git a/win32/config.bc b/win32/config.bc
index 1726a369c5..fa1daf9e8b 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -67,6 +67,7 @@ cppminus=''
 cpprun='cpp32 -oCON'
 cppstdin='cpp32 -oCON'
 cppsymbols=''
+crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='gcvt((x),(n),(b))'
@@ -518,6 +519,7 @@ mmaptype='void *'
 models='none'
 modetype='mode_t'
 more='more /e'
+multiarch='undef'
 mv=''
 myarchname='MSWin32'
 mydomain=''
diff --git a/win32/config.gc b/win32/config.gc
index a1d5d0baf1..e270d49820 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -67,6 +67,7 @@ cppminus='-'
 cpprun='gcc -E'
 cppstdin='gcc -E'
 cppsymbols=''
+crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
@@ -518,6 +519,7 @@ mmaptype='void *'
 models='none'
 modetype='mode_t'
 more='more /e'
+multiarch='undef'
 mv=''
 myarchname='MSWin32'
 mydomain=''
diff --git a/win32/config.vc b/win32/config.vc
index 11aa47e12f..082b4c1db4 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -67,6 +67,7 @@ cppminus=''
 cpprun='cl -nologo -E'
 cppstdin='cl -nologo -E'
 cppsymbols=''
+crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
@@ -518,6 +519,7 @@ mmaptype='void *'
 models='none'
 modetype='mode_t'
 more='more /e'
+multiarch='undef'
 mv=''
 myarchname='MSWin32'
 mydomain=''
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 3051ee02b5..cfa64748f3 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -2056,6 +2056,18 @@
  */
 /*#define HAS_MPROTECT		/**/
 
+/* MULTIARCH:
+ *	This symbol, if defined, indicates that we have a multiarchitecture
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
+/* CROSSCOMPILE:
+ *	This symbol, if defined, indicates that we have a cross-compile
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
  *	available to do gather reads.  You will also need <sys/uio.h>
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 23e2ac5ab0..0d30b29ce2 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -2056,6 +2056,18 @@
  */
 /*#define HAS_MPROTECT		/**/
 
+/* MULTIARCH:
+ *	This symbol, if defined, indicates that we have a multiarchitecture
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
+/* CROSSCOMPILE:
+ *	This symbol, if defined, indicates that we have a cross-compile
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
  *	available to do gather reads.  You will also need <sys/uio.h>
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 8db3fcb7d9..3b2185fd4e 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -2056,6 +2056,18 @@
  */
 /*#define HAS_MPROTECT		/**/
 
+/* MULTIARCH:
+ *	This symbol, if defined, indicates that we have a multiarchitecture
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
+/* CROSSCOMPILE:
+ *	This symbol, if defined, indicates that we have a cross-compile
+ *	build.
+ */
+/*#define MULTIARCH		/**/
+
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
  *	available to do gather reads.  You will also need <sys/uio.h>