Skip to content

Commit 768677c

Browse files
committed
Remove 5005threads vestiges from Configure and friends
See Perl/metaconfig#66
1 parent cdac9b8 commit 768677c

20 files changed

+38
-166
lines changed

Configure

Lines changed: 4 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# you should use metaconfig. Perl uses a modified version of this
1717
# tool, and this, together with the metaconfig units, are available
1818
# in the git repository:
19-
# $ git clone https://github.com/perl5-metaconfig/metaconfig metaconfig
19+
# $ git clone https://github.com/Perl/metaconfig metaconfig
2020
# The original dist package (including metaconfig) is available on github:
2121
# $ git clone https://github.com/rmanfredi/dist.git dist-git
2222
#
@@ -1354,7 +1354,6 @@ useperlio=''
13541354
usequadmath=''
13551355
usesocks=''
13561356
d_oldpthreads=''
1357-
use5005threads=''
13581357
useithreads=''
13591358
usereentrant=''
13601359
usethreads=''
@@ -4391,9 +4390,9 @@ fi
43914390
: Do we want threads support and if so, what type
43924391
case "$usethreads" in
43934392
$define|true|[yY]*) dflt='y';;
4394-
*) # Catch case where user specified ithreads or 5005threads but
4393+
*) # Catch case where user specified ithreads but
43954394
# forgot -Dusethreads (A.D. 4/2002)
4396-
case "$useithreads$use5005threads" in
4395+
case "$useithreads" in
43974396
*$define*) dflt='y';;
43984397
*) dflt='n';;
43994398
esac
@@ -4418,74 +4417,7 @@ esac
44184417
set usethreads
44194418
eval $setvar
44204419

4421-
if $test $patchlevel -lt 9; then
4422-
case "$usethreads" in
4423-
$define)
4424-
: Default to ithreads unless overridden on command line or with
4425-
: old config.sh
4426-
dflt='y'
4427-
case "$use5005threads" in
4428-
$define|true|[yY]*)
4429-
echo "5.005 threads are no longer supported"
4430-
exit 1
4431-
;;
4432-
esac
4433-
case "$useithreads" in
4434-
$undef|false|[nN]*) dflt='n';;
4435-
esac
4436-
rp='Use the newer interpreter-based ithreads?'
4437-
. ./myread
4438-
case "$ans" in
4439-
y|Y) val="$define" ;;
4440-
*) val="$undef" ;;
4441-
esac
4442-
set useithreads
4443-
eval $setvar
4444-
: Now set use5005threads to the opposite value.
4445-
case "$useithreads" in
4446-
$define) val="$undef" ;;
4447-
*) val="$define" ;;
4448-
esac
4449-
set use5005threads
4450-
eval $setvar
4451-
;;
4452-
*)
4453-
useithreads="$undef"
4454-
use5005threads="$undef"
4455-
;;
4456-
esac
4457-
4458-
case "$useithreads$use5005threads" in
4459-
"$define$define")
4460-
$cat >&4 <<EOM
4461-
4462-
You cannot have both the ithreads and the 5.005 threads enabled
4463-
at the same time. Disabling the 5.005 threads since they are
4464-
much less stable than the ithreads.
4465-
4466-
EOM
4467-
use5005threads="$undef"
4468-
;;
4469-
esac
4470-
4471-
else
4472-
: perl-5.9.x and later
4473-
4474-
if test X"$usethreads" = "X$define"; then
4475-
case "$use5005threads" in
4476-
$define|true|[yY]*)
4477-
$cat >&4 <<EOM
4478-
4479-
5.005 threads has been removed for 5.10. Perl will be built using ithreads.
4480-
4481-
EOM
4482-
;;
4483-
esac
4484-
fi
4485-
4486-
use5005threads="$undef"
4487-
useithreads="$usethreads"
4488-
fi
4420+
useithreads="$usethreads"
44894421

44904422
case "$d_oldpthreads" in
44914423
'') : Configure tests would be welcome here. For now, assume undef.
@@ -23631,14 +23563,6 @@ for xxx in $xs_extensions ; do
2363123563
;;
2363223564
esac
2363323565
;;
23634-
Thread|thread)
23635-
case "$usethreads" in
23636-
true|$define|y)
23637-
case "$use5005threads" in
23638-
$define|true|[yY]*) avail_ext="$avail_ext $xxx" ;;
23639-
esac
23640-
esac
23641-
;;
2364223566
threads|threads/shared)
2364323567
# threads and threads::shared are special cases.
2364423568
# To stop people from asking "Perl 5.8.0 was supposed
@@ -25110,7 +25034,6 @@ uidtype='$uidtype'
2511025034
uname='$uname'
2511125035
uniq='$uniq'
2511225036
uquadtype='$uquadtype'
25113-
use5005threads='$use5005threads'
2511425037
use64bitall='$use64bitall'
2511525038
use64bitint='$use64bitint'
2511625039
usecbacktrace='$usecbacktrace'

Cross/config.sh-arm-linux

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,6 @@ uidtype='uid_t'
11201120
uname='uname'
11211121
uniq='uniq'
11221122
uquadtype='unsigned long long'
1123-
use5005threads='undef'
11241123
use64bitall='undef'
11251124
use64bitint='undef'
11261125
usecbacktrace='undef'

Cross/config.sh-arm-linux-n770

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,6 @@ uidtype='uid_t'
11181118
uname='uname'
11191119
uniq='uniq'
11201120
uquadtype='unsigned long long'
1121-
use5005threads='undef'
11221121
use64bitall='undef'
11231122
use64bitint='undef'
11241123
usecbacktrace='undef'

NetWare/config.wc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,6 @@ uidtype='uid_t'
10831083
uname='uname'
10841084
uniq='uniq'
10851085
uquadtype='unsigned __int64'
1086-
use5005threads='undef'
10871086
use64bitall='undef'
10881087
use64bitint='undef'
10891088
usecbacktrace='undef'

Porting/Glossary

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5517,11 +5517,6 @@ uquadtype (quadtype.U):
55175517
unsigned int, unsigned long long, uint64_t, or whatever type is
55185518
used for 64-bit integers.
55195519

5520-
use5005threads (usethreads.U):
5521-
This variable conditionally defines the USE_5005THREADS symbol,
5522-
and indicates that Perl should be built to use the 5.005-based
5523-
threading implementation. Only valid up to 5.8.x.
5524-
55255520
use64bitall (use64bits.U):
55265521
This variable conditionally defines the USE_64_BIT_ALL symbol,
55275522
and indicates that 64-bit integer types should be used

Porting/config.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,6 @@ uidtype='uid_t'
11491149
uname='uname'
11501150
uniq='uniq'
11511151
uquadtype='unsigned long'
1152-
use5005threads='undef'
11531152
use64bitall='define'
11541153
use64bitint='define'
11551154
usecbacktrace='undef'

Porting/config_H

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5071,11 +5071,6 @@
50715071
* This symbol, if defined, indicates that Perl should be built to
50725072
* use the interpreter-based threading implementation.
50735073
*/
5074-
/* USE_5005THREADS:
5075-
* This symbol, if defined, indicates that Perl should be built to
5076-
* use the 5.005-based threading implementation.
5077-
* Only valid up to 5.8.x.
5078-
*/
50795074
/* OLD_PTHREADS_API:
50805075
* This symbol, if defined, indicates that Perl should
50815076
* be built to use the old draft POSIX threads API.
@@ -5085,11 +5080,8 @@
50855080
* try to use the various _r versions of library functions.
50865081
* This is extremely experimental.
50875082
*/
5088-
/*#define USE_5005THREADS / **/
50895083
/*#define USE_ITHREADS / **/
5090-
#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
5091-
#define USE_THREADS /* until src is revised*/
5092-
#endif
5084+
/*#define USE_THREADS / **/
50935085
/*#define OLD_PTHREADS_API / **/
50945086
/*#define USE_REENTRANT_API / **/
50955087

config_h.SH

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5154,10 +5154,11 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
51545154
* This symbol, if defined, indicates that Perl should be built to
51555155
* use the interpreter-based threading implementation.
51565156
*/
5157-
/* USE_5005THREADS:
5158-
* This symbol, if defined, indicates that Perl should be built to
5159-
* use the 5.005-based threading implementation.
5160-
* Only valid up to 5.8.x.
5157+
/* USE_THREADS:
5158+
* This symbol, if defined, indicates that Perl should
5159+
* be built to use threads. At present, it is a synonym for
5160+
* and USE_ITHREADS, but eventually the source ought to be
5161+
* changed to use this to mean _any_ threading implementation.
51615162
*/
51625163
/* OLD_PTHREADS_API:
51635164
* 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
51685169
* try to use the various _r versions of library functions.
51695170
* This is extremely experimental.
51705171
*/
5171-
#$use5005threads USE_5005THREADS /**/
51725172
#$useithreads USE_ITHREADS /**/
5173-
#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
5174-
#define USE_THREADS /* until src is revised*/
5175-
#endif
5173+
#$usethreads USE_THREADS /**/
51765174
#$d_oldpthreads OLD_PTHREADS_API /**/
51775175
#$usereentrant USE_REENTRANT_API /**/
51785176

configpm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,6 @@ cppflags: 185
12551255
ptrsize: 185
12561256
shrpenv: 185
12571257
static_ext: 185
1258-
use5005threads: 185
12591258
uselargefiles: 185
12601259
alignbytes: 184
12611260
byteorder: 184

configure.com

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ $ ccname="DECC"
146146
$ Dec_C_Version = ""
147147
$ cxxversion = ""
148148
$ use_threads = "F"
149-
$ use_5005_threads = "N"
150149
$ use_ithreads = "N"
151150
$!
152151
$!: option parsing
@@ -2001,18 +2000,9 @@ $ if f$type(useithreads) .nes. ""
20012000
$ then
20022001
$ if useithreads .eqs. "undef" then bool_dflt="n"
20032002
$ endif
2004-
$ if f$type(use5005threads) .nes. ""
2005-
$ then
2006-
$ if use5005threads .or. use5005threads .eqs. "define"
2007-
$ then
2008-
$ echo "5.005 threads are no longer supported"
2009-
$ exit 44
2010-
$ endif
2011-
$ endif
20122003
$ rp = "Use the newer interpreter-based ithreads? [''bool_dflt'] "
20132004
$ GOSUB myread
20142005
$ use_ithreads=ans
2015-
$ use_5005_threads="N"
20162006
$ ! Are they on VMS 7.1 or greater?
20172007
$ IF "''f$extract(1,3, f$getsyi(""version""))'" .GES. "7.1"
20182008
$ THEN
@@ -3437,7 +3427,6 @@ $ ENDIF
34373427
$!
34383428
$! Now some that we build up
34393429
$!
3440-
$ use5005threads = "undef"
34413430
$ d_old_pthread_create_joinable = "undef"
34423431
$ old_pthread_create_joinable = " "
34433432
$ IF use_threads
@@ -6995,7 +6984,6 @@ $ WC "uidsign='1'"
69956984
$ WC "uidsize='4'"
69966985
$ WC "uidtype='" + uidtype + "'"
69976986
$ WC "uquadtype='" + uquadtype + "'"
6998-
$ WC "use5005threads='" + use5005threads + "'"
69996987
$ WC "use64bitall='" + use64bitall + "'"
70006988
$ WC "use64bitint='" + use64bitint + "'"
70016989
$ WC "usecasesensitive='" + be_case_sensitive + "'" ! VMS-specific

0 commit comments

Comments
 (0)