Remove 5005threads vestiges from Configure and friends

See https://github.com/Perl/metaconfig/pull/66/

diff --git a/Configure b/Configure
index cef8c3c..0ec8bb7 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -16,7 +16,7 @@
 # you should use metaconfig. Perl uses a modified version of this
 # tool, and this, together with the metaconfig units, are available
 # in the git repository:
-#    $ git clone https://github.com/perl5-metaconfig/metaconfig metaconfig
+#    $ git clone https://github.com/Perl/metaconfig metaconfig
 # The original dist package (including metaconfig) is available on github:
 #    $ git clone https://github.com/rmanfredi/dist.git dist-git
 #
@@ -1354,7 +1354,6 @@ useperlio=''
 usequadmath=''
 usesocks=''
 d_oldpthreads=''
-use5005threads=''
 useithreads=''
 usereentrant=''
 usethreads=''
@@ -4391,9 +4390,9 @@ fi
 : Do we want threads support and if so, what type
 case "$usethreads" in
 $define|true|[yY]*)     dflt='y';;
-*)     # Catch case where user specified ithreads or 5005threads but
+*)     # Catch case where user specified ithreads but
        # forgot -Dusethreads (A.D. 4/2002)
-       case "$useithreads$use5005threads" in
+       case "$useithreads" in
        *$define*)      dflt='y';;
        *)              dflt='n';;
        esac
@@ -4418,74 +4417,7 @@ esac
 set usethreads
 eval $setvar
 
-if $test $patchlevel -lt 9; then
-    case "$usethreads" in
-    $define)
-       : Default to ithreads unless overridden on command line or with
-       : old config.sh
-       dflt='y'
-       case "$use5005threads" in
-               $define|true|[yY]*)
-                       echo "5.005 threads are no longer supported"
-                       exit 1
-               ;;
-       esac
-       case "$useithreads" in
-               $undef|false|[nN]*) dflt='n';;
-       esac
-       rp='Use the newer interpreter-based ithreads?'
-       . ./myread
-       case "$ans" in
-       y|Y)    val="$define" ;;
-       *)      val="$undef" ;;
-       esac
-       set useithreads
-       eval $setvar
-       : Now set use5005threads to the opposite value.
-       case "$useithreads" in
-       $define) val="$undef" ;;
-       *) val="$define" ;;
-       esac
-       set use5005threads
-       eval $setvar
-       ;;
-    *)
-       useithreads="$undef"
-       use5005threads="$undef"
-       ;;
-    esac
-
-    case "$useithreads$use5005threads" in
-    "$define$define")
-       $cat >&4 <<EOM
-
-You cannot have both the ithreads and the 5.005 threads enabled
-at the same time.  Disabling the 5.005 threads since they are
-much less stable than the ithreads.
-
-EOM
-       use5005threads="$undef"
-       ;;
-    esac
-
-else
-: perl-5.9.x and later
-
-    if test X"$usethreads" = "X$define"; then
-       case "$use5005threads" in
-           $define|true|[yY]*)
-               $cat >&4 <<EOM
-
-5.005 threads has been removed for 5.10.  Perl will be built using ithreads.
-
-EOM
-           ;;
-       esac
-    fi
-
-    use5005threads="$undef"
-    useithreads="$usethreads"
-fi
+useithreads="$usethreads"
 
 case "$d_oldpthreads" in
 '')    : Configure tests would be welcome here.  For now, assume undef.
@@ -23631,14 +23563,6 @@ for xxx in $xs_extensions ; do
                        ;;
                esac
                ;;
-       Thread|thread)
-                case "$usethreads" in
-                true|$define|y)
-                        case "$use5005threads" in
-                        $define|true|[yY]*) avail_ext="$avail_ext $xxx" ;;
-                        esac
-               esac
-               ;;
        threads|threads/shared)
                # threads and threads::shared are special cases.
                # To stop people from asking "Perl 5.8.0 was supposed
@@ -25110,7 +25034,6 @@ uidtype='$uidtype'
 uname='$uname'
 uniq='$uniq'
 uquadtype='$uquadtype'
-use5005threads='$use5005threads'
 use64bitall='$use64bitall'
 use64bitint='$use64bitint'
 usecbacktrace='$usecbacktrace'

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index cd8fdcd..97b9255 100644 (file)
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -1120,7 +1120,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 40e7253..a2b9c54 100644 (file)
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -1118,7 +1118,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/NetWare/config.wc b/NetWare/config.wc
index b0a02f5..78de6d3 100644 (file)
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -1083,7 +1083,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/Porting/Glossary b/Porting/Glossary
index 102c6e2..cf95dcd 100644 (file)
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -5517,11 +5517,6 @@ uquadtype (quadtype.U):
        unsigned int, unsigned long long, uint64_t, or whatever type is
        used for 64-bit integers.
 
-use5005threads (usethreads.U):
-       This variable conditionally defines the USE_5005THREADS symbol,
-       and indicates that Perl should be built to use the 5.005-based
-       threading implementation. Only valid up to 5.8.x.
-
 use64bitall (use64bits.U):
        This variable conditionally defines the USE_64_BIT_ALL symbol,
        and indicates that 64-bit integer types should be used

diff --git a/Porting/config.sh b/Porting/config.sh
index 8dd7056..a346f8a 100644 (file)
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -1149,7 +1149,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long'
-use5005threads='undef'
 use64bitall='define'
 use64bitint='define'
 usecbacktrace='undef'

diff --git a/Porting/config_H b/Porting/config_H
index d02a841..974f768 100644 (file)
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -5071,11 +5071,6 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- *     Only valid up to 5.8.x.
- */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
  *     be built to use the old draft POSIX threads API.
@@ -5085,11 +5080,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/
 

diff --git a/config_h.SH b/config_h.SH
index 08c5923..437baff 100755 (executable)
--- a/config_h.SH
+++ b/config_h.SH
@@ -5154,10 +5154,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- *     Only valid up to 5.8.x.
+/* USE_THREADS:
+ *     This symbol, if defined, indicates that Perl should
+ *     be built to use threads.  At present, it is a synonym for
+ *     and USE_ITHREADS, but eventually the source ought to be
+ *     changed to use this to mean _any_ threading implementation.
  */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
@@ -5168,11 +5169,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-#$use5005threads       USE_5005THREADS         /**/
 #$useithreads  USE_ITHREADS            /**/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+#$usethreads           USE_THREADS             /**/
 #$d_oldpthreads        OLD_PTHREADS_API                /**/
 #$usereentrant USE_REENTRANT_API       /**/
 

diff --git a/configpm b/configpm
index 8c4bd14..0451f2d 100755 (executable)
--- a/configpm
+++ b/configpm
@@ -1255,7 +1255,6 @@ cppflags: 185
 ptrsize:       185
 shrpenv:       185
 static_ext:    185
-use5005threads:        185
 uselargefiles: 185
 alignbytes:    184
 byteorder:     184

diff --git a/configure.com b/configure.com
index 713e875..20fc059 100644 (file)
--- a/configure.com
+++ b/configure.com
@@ -146,7 +146,6 @@ $ ccname="DECC"
 $ Dec_C_Version = ""
 $ cxxversion = ""
 $ use_threads = "F"
-$ use_5005_threads = "N"
 $ use_ithreads = "N"
 $!
 $!: option parsing
@@ -2001,18 +2000,9 @@ $     if f$type(useithreads) .nes. ""
 $     then
 $         if useithreads .eqs. "undef" then bool_dflt="n"
 $     endif
-$     if f$type(use5005threads) .nes. ""
-$     then
-$         if use5005threads .or. use5005threads .eqs. "define"
-$         then
-$             echo "5.005 threads are no longer supported"
-$             exit 44
-$         endif
-$     endif
 $     rp = "Use the newer interpreter-based ithreads? [''bool_dflt'] "
 $     GOSUB myread
 $     use_ithreads=ans
-$     use_5005_threads="N"
 $     ! Are they on VMS 7.1 or greater?
 $     IF "''f$extract(1,3, f$getsyi(""version""))'" .GES. "7.1"
 $     THEN
@@ -3437,7 +3427,6 @@ $ ENDIF
 $!
 $! Now some that we build up
 $!
-$ use5005threads = "undef"
 $ d_old_pthread_create_joinable = "undef"
 $ old_pthread_create_joinable = " "
 $ IF use_threads
@@ -6995,7 +6984,6 @@ $ WC "uidsign='1'"
 $ WC "uidsize='4'"
 $ WC "uidtype='" + uidtype + "'"
 $ WC "uquadtype='" + uquadtype + "'" 
-$ WC "use5005threads='" + use5005threads + "'"
 $ WC "use64bitall='" + use64bitall + "'"
 $ WC "use64bitint='" + use64bitint + "'"
 $ WC "usecasesensitive='" + be_case_sensitive + "'"    ! VMS-specific

diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 9970f64..c5b427e 100644 (file)
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3533,10 +3533,6 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
  *     be built to use the old draft POSIX threads API.
@@ -3546,11 +3542,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/
 

diff --git a/plan9/config_h.sample b/plan9/config_h.sample
index f71d55b..6518178 100644 (file)
--- a/plan9/config_h.sample
+++ b/plan9/config_h.sample
@@ -3351,9 +3351,11 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
+/* USE_THREADS:
+ *     This symbol, if defined, indicates that Perl should
+ *     be built to use threads.  At present, it is a synonym for
+ *     and USE_ITHREADS, but eventually the source ought to be
+ *     changed to use this to mean _any_ threading implementation.
  */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
@@ -3364,11 +3366,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/
 

diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index cdcea2d..29bd37d 100644 (file)
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -1091,7 +1091,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/uconfig.h b/uconfig.h
index 24e0a35..284c5b8 100644 (file)
--- a/uconfig.h
+++ b/uconfig.h
@@ -5119,10 +5119,11 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- *     Only valid up to 5.8.x.
+/* USE_THREADS:
+ *     This symbol, if defined, indicates that Perl should
+ *     be built to use threads.  At present, it is a synonym for
+ *     and USE_ITHREADS, but eventually the source ought to be
+ *     changed to use this to mean _any_ threading implementation.
  */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
@@ -5133,11 +5134,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/
 
@@ -5260,6 +5258,6 @@
 #endif
 
 /* Generated from:
- * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH
- * 36943454dd4cff2f1fd6a87074c461192a18b540d34c4d348707cc8cf7b8fcfc uconfig.sh
+ * 6dd4e24d96ab9010e60456eabf099b26980d900fb937af5b501d45017e4f8ed0 config_h.SH
+ * 0328fd317c240be96131cf63f152ee17113e74b68e3dc0000e2876b9a0023713 uconfig.sh
  * ex: set ro: */

diff --git a/uconfig.sh b/uconfig.sh
index b1ed39e..a8a0714 100644 (file)
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -874,7 +874,6 @@ uidsign='1'
 uidsize='4'
 uidtype=int
 uquadtype='uint64_t'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/uconfig64.sh b/uconfig64.sh
index 112689f..2716afc 100644 (file)
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -874,7 +874,6 @@ uidsign='1'
 uidsize='4'
 uidtype=int
 uquadtype='unsigned long'
-use5005threads='undef'
 use64bitall='define'
 use64bitint='define'
 usecbacktrace='undef'

diff --git a/win32/config.gc b/win32/config.gc
index 793b455..e263747 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -1115,7 +1115,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned long long'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/win32/config.vc b/win32/config.vc
index a2c3f5a..b166ea1 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -1114,7 +1114,6 @@ uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 uquadtype='unsigned __int64'
-use5005threads='undef'
 use64bitall='undef'
 use64bitint='undef'
 usecbacktrace='undef'

diff --git a/win32/config_H.gc b/win32/config_H.gc
index f24b5d3..e00c00d 100644 (file)
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -4987,10 +4987,11 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- *     Only valid up to 5.8.x.
+/* USE_THREADS:
+ *     This symbol, if defined, indicates that Perl should
+ *     be built to use threads.  At present, it is a synonym for
+ *     and USE_ITHREADS, but eventually the source ought to be
+ *     changed to use this to mean _any_ threading implementation.
  */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
@@ -5001,11 +5002,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/
 

diff --git a/win32/config_H.vc b/win32/config_H.vc
index a0168b8..510d364 100644 (file)
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -4978,10 +4978,11 @@
  *     This symbol, if defined, indicates that Perl should be built to
  *     use the interpreter-based threading implementation.
  */
-/* USE_5005THREADS:
- *     This symbol, if defined, indicates that Perl should be built to
- *     use the 5.005-based threading implementation.
- *     Only valid up to 5.8.x.
+/* USE_THREADS:
+ *     This symbol, if defined, indicates that Perl should
+ *     be built to use threads.  At present, it is a synonym for
+ *     and USE_ITHREADS, but eventually the source ought to be
+ *     changed to use this to mean _any_ threading implementation.
  */
 /* OLD_PTHREADS_API:
  *     This symbol, if defined, indicates that Perl should
@@ -4992,11 +4993,8 @@
  *     try to use the various _r versions of library functions.
  *     This is extremely experimental.
  */
-/*#define      USE_5005THREADS         / **/
 /*#define      USE_ITHREADS            / **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define                USE_THREADS             /* until src is revised*/
-#endif
+/*#define              USE_THREADS             / **/
 /*#define      OLD_PTHREADS_API                / **/
 /*#define      USE_REENTRANT_API       / **/