Add bootstrap_charset/BOOTSTRAP_CHARSET for non-ASCII architectures

15 files changed, 57 insertions, 29 deletions

diff --git a/Configure b/Configure
index 6823cb737d..6c71218c8d 100755
--- a/Configure
+++ b/Configure
@@ -28,7 +28,7 @@
 # See Porting/pumpkin.pod for more information on metaconfig.
 #
 
-# Generated on Fri Feb 15 14:51:06 CET 2013 [metaconfig 3.5 PL0]
+# Generated on Sat Mar  9 17:50:01 CET 2013 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -851,6 +851,7 @@ ld_can_script=''
 lddlflags=''
 usedl=''
 doublesize=''
+bootstrap_charset=''
 ebcdic=''
 fflushNULL=''
 fflushall=''
@@ -19130,6 +19131,39 @@ esac
 : set the base revision
 baserev=5.0
 
+: Determine if this is an EBCDIC system
+echo " "
+echo "Determining whether or not we are on an EBCDIC system..." >&4
+$cat >try.c <<'EOM'
+int main()
+{
+  if ('M'==0xd4) return 0;
+  return 1;
+}
+EOM
+
+case "$BOOTSTRAP_CHARSET" in
+    Y|y|define) bootstrap_charset=$define	;;
+    *)		bootstrap_charset=$undef	;;
+esac
+
+val=$undef
+set try
+if eval $compile_ok; then
+	if $run ./try; then
+		echo "You seem to speak EBCDIC." >&4
+		val="$define"
+	else
+		echo "Nope, no EBCDIC, probably ASCII or some ISO Latin. Or UTF-8." >&4
+	fi
+else
+	echo "I'm unable to compile the test program." >&4
+	echo "I'll assume ASCII or some ISO Latin. Or UTF8." >&4
+fi
+$rm_try
+set ebcdic
+eval $setvar
+
 : length of character in bytes. Is always 1, otherwise it isnt C
 : This used to be a test using sizeof
 charsize=1
@@ -19527,34 +19561,6 @@ EOCP
 	esac
 done
 
-: Determine if this is an EBCDIC system
-echo " "
-echo "Determining whether or not we are on an EBCDIC system..." >&4
-$cat >try.c <<'EOM'
-int main()
-{
-  if ('M'==0xd4) return 0;
-  return 1;
-}
-EOM
-
-val=$undef
-set try
-if eval $compile_ok; then
-	if $run ./try; then
-		echo "You seem to speak EBCDIC." >&4
-		val="$define"
-	else
-		echo "Nope, no EBCDIC, probably ASCII or some ISO Latin. Or UTF-8." >&4
-	fi
-else
-	echo "I'm unable to compile the test program." >&4
-	echo "I'll assume ASCII or some ISO Latin. Or UTF8." >&4
-fi
-$rm_try
-set ebcdic
-eval $setvar
-
 : Check how to flush
 echo " "
 $cat >&4 <<EOM
@@ -22889,6 +22895,7 @@ bin='$bin'
 bin_ELF='$bin_ELF'
 binexp='$binexp'
 bison='$bison'
+bootstrap_charset='$bootstrap_charset'
 byacc='$byacc'
 byteorder='$byteorder'
 c='$c'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 1cb5ddd4e5..10bdf1131b 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -48,6 +48,7 @@ bash=''
 bin='/usr/bin'
 binexp='/usr/bin'
 bison='bison'
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''
diff --git a/NetWare/config.wc b/NetWare/config.wc
index b3da4a65f3..3da939a3db 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -37,6 +37,7 @@ bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''
diff --git a/Porting/Glossary b/Porting/Glossary
index 4b5ded2d81..fbc5bb629e 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -164,6 +164,10 @@ bison (Loc.U):
 	full pathname (if any) of the bison program.  After Configure runs,
 	the value is reset to a plain "bison" and is not useful.
 
+bootstrap_charset (ebcdic.U):
+	This variable conditionally defines BOOTSTRAP_CHARSET if
+	this system uses non-ASCII encoding.
+
 byacc (Loc.U):
 	This variable is used internally by Configure to determine the
 	full pathname (if any) of the byacc program.  After Configure runs,
diff --git a/Porting/config.sh b/Porting/config.sh
index 6c8cff7506..a9facaf1c3 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -61,6 +61,7 @@ bash=''
 bin='/opt/perl/bin'
 binexp='/opt/perl/bin'
 bison='bison'
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='12345678'
 c=''
diff --git a/config_h.SH b/config_h.SH
index dfb57b5365..842f13e0be 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -2711,7 +2711,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *     This symbol, if defined, indicates that this system uses
  *	EBCDIC encoding.
  */
+/* BOOTSTRAP_CHARSET:
+ *     This symbol, if defined, indicates that this system uses
+ *	BOOTSTRAP_CHARSET
+ */
 #$ebcdic	EBCDIC 		/**/
+#$bootstrap_charset	BOOTSTRAP_CHARSET	/**/
 
 /* Fpos_t:
  *	This symbol holds the type used to declare file positions in libc.
diff --git a/configure.com b/configure.com
index 92045cd2c1..f3535f9cb3 100644
--- a/configure.com
+++ b/configure.com
@@ -5893,6 +5893,7 @@ $ WC "archname='" + archname + "'"
 $ WC "baserev='" + baserev + "'"
 $ WC "bin='" + bin + "'"
 $ WC "binexp='" + binexp + "'"
+$ WC "bootstrap_charset='undef'"
 $ WC "builddir='" + builddir + "'"
 $ WC "byteorder='1234'"
 $ WC "castflags='0'"
diff --git a/metaconfig.h b/metaconfig.h
index 9813c2e29a..0a90c86ed0 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -10,6 +10,7 @@
  * they won't be available unless used. When new symbols are probed
  * in Configure, this is the way to force them into availability.
  *
+ * BOOTSTRAP_CHARSET
  * CHARBITS
  * HAS_ASCTIME64
  * HAS_CTIME64
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 9d05e43c93..71b1de7493 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -48,6 +48,7 @@ bash=''
 bin='/usr/bin'
 binexp='/usr/bin'
 bison='bison'
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''
diff --git a/symbian/config.sh b/symbian/config.sh
index d9a4c06562..7f7895719a 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -15,6 +15,7 @@ asctime_r_proto='0'
 bin='\\system\\apps\\perl'
 bincompat5005='n'
 binexp='\\system\\apps\\perl'
+bootstrap_charset='undef'
 byteorder='1234'
 castflags='0'
 cc='gcc'
diff --git a/uconfig.sh b/uconfig.sh
index d23c0daa25..80d1ec85ba 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -12,6 +12,7 @@ archname='unknown'
 asctime_r_proto='0'
 bin='/usr/local/bin'
 binexp='/usr/local/bin'
+bootstrap_charset='undef'
 byteorder='1234'
 castflags='0'
 cf_by='root@localhost'
diff --git a/uconfig64.sh b/uconfig64.sh
index 1efdde5b77..839d08b829 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -13,6 +13,7 @@ archname='unknown64'
 asctime_r_proto='0'
 bin='/usr/local/bin'
 binexp='/usr/local/bin'
+bootstrap_charset='undef'
 byteorder='12345678'
 castflags='0'
 cf_by='root@localhost'
diff --git a/win32/config.ce b/win32/config.ce
index 39ec1f4629..29071d5cd7 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -35,6 +35,7 @@ bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''
diff --git a/win32/config.gc b/win32/config.gc
index c51d30a921..12b4296c81 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -35,6 +35,7 @@ bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''
diff --git a/win32/config.vc b/win32/config.vc
index 0e975fd27c..6723444cc5 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -35,6 +35,7 @@ bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
+bootstrap_charset='undef'
 byacc='byacc'
 byteorder='1234'
 c=''