remove BOOTSTRAP_CHARSET from Configure (khw's request)

3 files changed, 41 insertions, 59 deletions

diff --git a/Configure b/Configure
index a8e4a48fae..56d5ffd6d2 100755
--- a/Configure
+++ b/Configure
@@ -28,7 +28,7 @@
 # See Porting/pumpkin.pod for more information on metaconfig.
 #
 
-# Generated on Wed Apr  9 12:24:24 CEST 2014 [metaconfig 3.5 PL0]
+# Generated on Sun Jun  1 11:24:10 CEST 2014 [metaconfig 3.5 PL0]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -858,7 +858,6 @@ ld_can_script=''
 lddlflags=''
 usedl=''
 doublesize=''
-bootstrap_charset=''
 ebcdic=''
 fflushNULL=''
 fflushall=''
@@ -19273,39 +19272,6 @@ $rm_try
 : 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 is not C
 : This used to be a test using sizeof
 charsize=1
@@ -19592,6 +19558,34 @@ seedfunc="Perl_drand48_init"
 randbits=48
 randseedtype=U32
 
+: 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
@@ -22921,7 +22915,6 @@ bin='$bin'
 bin_ELF='$bin_ELF'
 binexp='$binexp'
 bison='$bison'
-bootstrap_charset='$bootstrap_charset'
 byacc='$byacc'
 byteorder='$byteorder'
 c='$c'
diff --git a/Porting/Glossary b/Porting/Glossary
index f8fc4e4e9b..cf6c2447fe 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -164,10 +164,6 @@ 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,
@@ -2945,11 +2941,12 @@ hint (Oldconfig.U):
 	Gives the type of hints used for previous answers. May be one of
 	"default", "recommended" or "previous".
 
-hostperl (Cross.U):
-	This variable contains the path to a miniperl binary that can be
-	run on the host OS when cross-compiling.  Useful and available only
-	during Perl build.
-	Empty string '' if not cross-compiling.
+hostcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/hosts file.  This is normally "cat /etc/hosts", but can be
+	"ypcat hosts" when NIS is used.
+	On some systems, such as os390, there may be no equivalent
+	command, in which case this variable is unset.
 
 hostgenerate (Cross.U):
 	This variable contains the path to a generate_uudmap binary that
@@ -2963,12 +2960,11 @@ hostosname (Cross.U):
 	when running build code in the host.
 	Empty string '' if not cross-compiling.
 
-hostcat (nis.U):
-	This variable contains a command that produces the text of the
-	/etc/hosts file.  This is normally "cat /etc/hosts", but can be
-	"ypcat hosts" when NIS is used.
-	On some systems, such as os390, there may be no equivalent
-	command, in which case this variable is unset.
+hostperl (Cross.U):
+	This variable contains the path to a miniperl binary that can be
+	run on the host OS when cross-compiling.  Useful and available only
+	during Perl build.
+	Empty string '' if not cross-compiling.
 
 html1dir (html1dir.U):
 	This variable contains the name of the directory in which html
@@ -4938,7 +4934,7 @@ targetport (Cross.U):
 	This variable contains the number of a network port to be used to
 	connect to the host in targethost, if unset defaults to 22 for ssh.
 
-targetsh (Cross.U):
+targetsh (sh.U):
 	If cross-compiling, this variable contains the location of sh on the
 	target system.
 	If not, this will be the same as $sh.
diff --git a/config_h.SH b/config_h.SH
index fd46735ad8..b3d2cc56bd 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -2673,14 +2673,7 @@ 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 needs
- *	converting various files to the native character set before
- *	bringing up perl on a system that has a non-ASCII character
- *	set and no working perl.
- */
 #$ebcdic	EBCDIC 		/**/
-#$bootstrap_charset	BOOTSTRAP_CHARSET	/**/
 
 /* Fpos_t:
  *	This symbol holds the type used to declare file positions in libc.