diff options
| -rwxr-xr-x | Configure | 91 | ||||
| -rw-r--r-- | INSTALL | 13 | ||||
| -rw-r--r-- | NetWare/config.wc | 2 | ||||
| -rw-r--r-- | Porting/Glossary | 17 | ||||
| -rw-r--r-- | Porting/config.sh | 2 | ||||
| -rw-r--r-- | README.mpeix | 3 | ||||
| -rw-r--r-- | config_h.SH | 4 | ||||
| -rw-r--r-- | configure.com | 1 | ||||
| -rw-r--r-- | epoc/config.sh | 2 | ||||
| -rw-r--r-- | hints/aix.sh | 3 | ||||
| -rw-r--r-- | hints/cygwin.sh | 4 | ||||
| -rw-r--r-- | hints/mpeix.sh | 1 | ||||
| -rw-r--r-- | makedef.pl | 37 | ||||
| -rw-r--r-- | myconfig.SH | 2 | ||||
| -rw-r--r-- | pod/perltoc.pod | 4 | ||||
| -rw-r--r-- | uconfig.h | 12 | ||||
| -rwxr-xr-x | uconfig.sh | 2 | ||||
| -rw-r--r-- | vos/config.alpha.def | 1 | ||||
| -rw-r--r-- | vos/config.ga.def | 1 | ||||
| -rw-r--r-- | win32/config.bc | 2 | ||||
| -rw-r--r-- | win32/config.gc | 2 | ||||
| -rw-r--r-- | win32/config.vc | 2 | ||||
| -rw-r--r-- | win32/config.vc64 | 2 | ||||
| -rw-r--r-- | wince/config.ce | 2 |
24 files changed, 56 insertions, 156 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Wed Apr 24 03:05:12 EET DST 2002 [metaconfig 3.0 PL70] +# Generated on Wed May 1 05:49:09 EET DST 2002 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -6642,45 +6642,6 @@ else installarchlib="$archlibexp" fi - -: Binary compatibility with 5.005 is not possible for builds -: with advanced features -case "$usethreads$usemultiplicity" in -*define*) - bincompat5005="$undef" - d_bincompat5005="$undef" - ;; -*) $cat <<EOM - -This version of Perl can be compiled for binary compatibility with 5.005. -If you decide to do so, you will be able to continue using most of the -extensions that were compiled for Perl 5.005. - -EOM - case "$bincompat5005$d_bincompat5005" in - *"$undef"*) dflt=n ;; - *) dflt=y ;; - esac - rp='Binary compatibility with Perl 5.005?' - . ./myread - case "$ans" in - y*) val="$define" ;; - *) val="$undef" ;; - esac - set d_bincompat5005 - eval $setvar - case "$d_bincompat5005" in - "$define") - bincompat5005="$define" - ;; - *) bincompat5005="$undef" - d_bincompat5005="$undef" - ;; - esac - ;; -esac - - : see if setuid scripts can be secure $cat <<EOM @@ -7337,11 +7298,7 @@ case "$dflt" in ''|' ') dflt=none ;; esac case "$dflt" in -5.005) case "$bincompat5005" in - $define|true|[yY]*) ;; - *) dflt=none ;; - esac - ;; +5.005) dflt=none ;; esac $cat <<'EOM' @@ -9401,6 +9358,45 @@ eval $inlibc set bcopy d_bcopy eval $inlibc + +: Binary compatibility with 5.005 is not possible for builds +: with advanced features +case "$usethreads$usemultiplicity" in +*define*) + bincompat5005="$undef" + d_bincompat5005="$undef" + ;; +*) $cat <<EOM + +This version of Perl can be compiled for binary compatibility with 5.005. +If you decide to do so, you will be able to continue using most of the +extensions that were compiled for Perl 5.005. + +EOM + case "$bincompat5005$d_bincompat5005" in + *"$undef"*) dflt=n ;; + *) dflt=y ;; + esac + rp='Binary compatibility with Perl 5.005?' + . ./myread + case "$ans" in + y*) val="$define" ;; + *) val="$undef" ;; + esac + set d_bincompat5005 + eval $setvar + case "$d_bincompat5005" in + "$define") + bincompat5005="$define" + ;; + *) bincompat5005="$undef" + d_bincompat5005="$undef" + ;; + esac + ;; +esac + + : see if this is a unistd.h system set unistd.h i_unistd eval $inhdr @@ -17917,10 +17913,7 @@ set pid_t pidtype int stdio.h sys/types.h eval $typedef_ask : Find earliest binary compatible site_perl subdirectory perl can use. -case "$bincompat5005" in -"$define") xs_apiversion='5.005' ;; -*) xs_apiversion=$version ;; # The current site_perl version. -esac +xs_apiversion=$version # The current site_perl version. : Find earliest pure perl site_perl subdirectory perl can use. : The versioned directories started at 5.005. pm_apiversion='5.005' @@ -107,7 +107,7 @@ Using the default Configure options for building perl should get you a perl that will be binary compatible with the 5.005 release. However, if you run Configure with any custom options, such as --Dusethreads, -Dusemultiplicity, -Dusemymalloc, -Ubincompat5005 etc., +-Dusethreads, -Dusemultiplicity, -Dusemymalloc, etc., the resulting perl will not be binary compatible. Under these circumstances, if you have dynamically loaded extensions that were built under perl 5.005, you will need to rebuild and reinstall all @@ -991,15 +991,8 @@ or you can answer 'n' at the appropriate interactive Configure prompt. =item -DPERL_POLLUTE_MALLOC -NOTE: This flag is enabled automatically on some platforms if you -asked for binary compatibility with version 5.005, or if you just -run Configure to accept all the defaults on those platforms. You -can refuse the automatic binary compatibility flags wholesale by -running: - - sh Configure -Ubincompat5005 - -or by answering 'n' at the appropriate prompt. +NOTE: This flag is enabled automatically on some platforms if you just +run Configure to accept all the defaults on those platforms. Perl's malloc family of functions are called Perl_malloc(), Perl_realloc(), Perl_calloc() and Perl_mfree(). When this flag is diff --git a/NetWare/config.wc b/NetWare/config.wc index fc1cc18a96..c3417b0f0f 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -36,7 +36,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -100,7 +99,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/Porting/Glossary b/Porting/Glossary index 80f05ed145..c731940d78 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -62,7 +62,7 @@ api_revision (patchlevel.U): possible value. The version list appropriate for the current system is determined in inc_version_list.U. XXX To do: Since compatibility can depend on compile time - options (such as bincompat, longlong, etc.) it should + options (such as longlong, etc.) it should (perhaps) be set by Configure, but currently it isn't. Currently, we read a hard-wired value from patchlevel.h. Perhaps what we ought to do is take the hard-wired value from @@ -141,10 +141,6 @@ bin (bin.U): is most often a local directory such as /usr/local/bin. Programs using this variable must be prepared to deal with ~name substitution. -bincompat5005 (bincompat5005.U): - This variable contains y if this version of Perl should be - binary-compatible with Perl 5.005. - binexp (bin.U): This is the same as the bin variable, but is filename expanded at configuration time, for use in your makefiles. @@ -400,13 +396,6 @@ d_bcopy (d_bcopy.U): This variable conditionally defines the HAS_BCOPY symbol if the bcopy() routine is available to copy strings. -d_bincompat5005 (bincompat5005.U): - This variable conditionally defines BINCOMPAT5005 so that embed.h - can take special action if this version of Perl should be - binary-compatible with Perl 5.005. This is impossible for builds - that use features like threads and multiplicity it is always $undef - for those versions. - d_bsd (Guess.U): This symbol conditionally defines the symbol BSD when running on a BSD system. @@ -4434,8 +4423,8 @@ xs_apiversion (xs_apiversion.U): See INSTALL for how this works. The versioned site_perl directory was introduced in 5.005, so that is the lowest possible value. - Since this can depend on compile time options (such as - bincompat) it is set by Configure. Other non-default sources + Since this can depend on compile time options + it is set by Configure. Other non-default sources of potential incompatibility, such as multiplicity, threads, debugging, 64bits, sfio, etc., are not checked for currently, though in principle we could go snooping around in old diff --git a/Porting/config.sh b/Porting/config.sh index 778b427106..5fcef92fca 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -46,7 +46,6 @@ awk='awk' baserev='5.0' bash='' bin='/opt/perl/bin' -bincompat5005='define' binexp='/opt/perl/bin' bison='bison' byacc='byacc' @@ -114,7 +113,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='define' d_bcopy='define' -d_bincompat5005='define' d_bsd='undef' d_bsdgetpgrp='undef' d_bsdsetpgrp='define' diff --git a/README.mpeix b/README.mpeix index 2f16506783..8203741d2f 100644 --- a/README.mpeix +++ b/README.mpeix @@ -42,9 +42,6 @@ mod_perl, you MUST download and install this version of Perl/iX! =item * -bincompat5005="undef": sorry, but you will have to recompile any -binary 5.005 extensions that you may be using (if any; there is no -5.005 code in what you download from bixby.org) uselargefiles="undef": not available in MPE for POSIX files yet. =item * diff --git a/config_h.SH b/config_h.SH index 508f8cddc6..a7e8a1aa3d 100644 --- a/config_h.SH +++ b/config_h.SH @@ -3604,8 +3604,8 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * See INSTALL for how this works. * The versioned site_perl directory was introduced in 5.005, * so that is the lowest possible value. - * Since this can depend on compile time options (such as - * bincompat) it is set by Configure. Other non-default sources + * Since this can depend on compile time options + * it is set by Configure. Other non-default sources * of potential incompatibility, such as multiplicity, threads, * debugging, 64bits, sfio, etc., are not checked for currently, * though in principle we could go snooping around in old diff --git a/configure.com b/configure.com index b4abec42b5..faec59dc76 100644 --- a/configure.com +++ b/configure.com @@ -5143,7 +5143,6 @@ $ WC "d_attribut='" + d_attribut + "'" $ WC "d_bcmp='" + d_bcmp + "'" $ WC "d_bcopy='" + d_bcopy + "'" $ WC "d_bincompat3='undef'" -$ WC "d_bincompat5005='undef'" $! WC "d_bsdpgrp='undef'" $ WC "d_bsdgetpgrp='undef'" $ WC "d_bsdsetpgrp='undef'" diff --git a/epoc/config.sh b/epoc/config.sh index 83673efee7..3b8862c280 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -43,7 +43,6 @@ awk='awk' baserev='5.0' bash='' bin='' -bincompat5005='false' binexp='' bison='bison' byacc='' @@ -106,7 +105,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='define' d_bcopy='define' -d_bincompat5005='undef' d_bsd='undef' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/hints/aix.sh b/hints/aix.sh index f3a3fc5528..ef3ff0787b 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -468,9 +468,6 @@ EOM ''|64*) archname64=64all ;; esac longsize="8" - # Don't try backwards compatibility - bincompat="$undef" - d_bincompat5005="$undef" qacflags='' qaldflags='' qalibs='' diff --git a/hints/cygwin.sh b/hints/cygwin.sh index e42be6461d..e88cab7930 100644 --- a/hints/cygwin.sh +++ b/hints/cygwin.sh @@ -33,10 +33,6 @@ archname='cygwin' cccdlflags=' ' ld='ld2' -# optional(ish) -# - perl malloc needs to be unpolluted -bincompat5005='undef' - # Win9x problem with non-blocking read from a closed pipe d_eofnblk='define' diff --git a/hints/mpeix.sh b/hints/mpeix.sh index 53db0152aa..f01b979fd2 100644 --- a/hints/mpeix.sh +++ b/hints/mpeix.sh @@ -143,7 +143,6 @@ timetype='time_t' # # Functionality. # -bincompat5005="$undef" uselargefiles="$undef" # # Expected functionality provided in mpeix.c. diff --git a/makedef.pl b/makedef.pl index d2184112fd..5539ba8643 100644 --- a/makedef.pl +++ b/makedef.pl @@ -11,39 +11,6 @@ my $PLATFORM; my $CCTYPE; -my %bincompat5005 = - ( - Perl_call_atexit => "perl_atexit", - Perl_eval_sv => "perl_eval_sv", - Perl_eval_pv => "perl_eval_pv", - Perl_call_argv => "perl_call_argv", - Perl_call_method => "perl_call_method", - Perl_call_pv => "perl_call_pv", - Perl_call_sv => "perl_call_sv", - Perl_get_av => "perl_get_av", - Perl_get_cv => "perl_get_cv", - Perl_get_hv => "perl_get_hv", - Perl_get_sv => "perl_get_sv", - Perl_init_i18nl10n => "perl_init_i18nl10n", - Perl_init_i18nl14n => "perl_init_i18nl14n", - Perl_new_collate => "perl_new_collate", - Perl_new_ctype => "perl_new_ctype", - Perl_new_numeric => "perl_new_numeric", - Perl_require_pv => "perl_require_pv", - Perl_safesyscalloc => "Perl_safecalloc", - Perl_safesysfree => "Perl_safefree", - Perl_safesysmalloc => "Perl_safemalloc", - Perl_safesysrealloc => "Perl_saferealloc", - Perl_set_numeric_local => "perl_set_numeric_local", - Perl_set_numeric_standard => "perl_set_numeric_standard", - Perl_malloc => "malloc", - Perl_mfree => "free", - Perl_realloc => "realloc", - Perl_calloc => "calloc", - ); - -my $bincompat5005 = join("|", keys %bincompat5005); - while (@ARGV) { my $flag = shift; $define{$1} = 1 if ($flag =~ /^-D(\w+)$/); @@ -1053,7 +1020,7 @@ elsif ($PLATFORM eq 'os2') { /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>; close MAP or die 'Cannot close miniperl.map'; - @missing = grep { !exists $mapped{$_} and !exists $bincompat5005{$_} } + @missing = grep { !exists $mapped{$_} } keys %export; delete $export{$_} foreach @missing; } @@ -1226,8 +1193,6 @@ sub emit_symbol { sub output_symbol { my $symbol = shift; - $symbol = $bincompat5005{$symbol} - if $define{PERL_BINCOMPAT_5005} and $symbol =~ /^($bincompat5005)$/; if ($PLATFORM eq 'win32') { $symbol = "_$symbol" if $CCTYPE eq 'BORLAND'; print "\t$symbol\n"; diff --git a/myconfig.SH b/myconfig.SH index a71d7a37a1..2942139a4d 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -36,7 +36,7 @@ Summary of my $package (revision $baserev $version_patchlevel_string) configurat usethreads=$usethreads use5005threads=$use5005threads useithreads=$useithreads usemultiplicity=$usemultiplicity useperlio=$useperlio d_sfio=$d_sfio uselargefiles=$uselargefiles usesocks=$usesocks use64bitint=$use64bitint use64bitall=$use64bitall uselongdouble=$uselongdouble - usemymalloc=$usemymalloc, bincompat5005=$d_bincompat5005 + usemymalloc=$usemymalloc, bincompat5005=undef Compiler: cc='$cc', ccflags ='$ccflags', optimize='$optimize', diff --git a/pod/perltoc.pod b/pod/perltoc.pod index cc9fd78743..b14290cef8 100644 --- a/pod/perltoc.pod +++ b/pod/perltoc.pod @@ -10167,7 +10167,7 @@ C<asctime_r_proto>, C<awk> =item b -C<baserev>, C<bash>, C<bin>, C<bincompat5005>, C<binexp>, C<bison>, +C<baserev>, C<bash>, C<bin>, C<binexp>, C<bison>, C<byacc>, C<byteorder> =item c @@ -10184,7 +10184,7 @@ C<csh>, C<ctermid_r_proto>, C<ctime_r_proto> C<d__fwalk>, C<d_access>, C<d_accessx>, C<d_alarm>, C<d_archlib>, C<d_asctime_r>, C<d_atolf>, C<d_atoll>, C<d_attribut>, C<d_bcmp>, -C<d_bcopy>, C<d_bincompat5005>, C<d_bsd>, C<d_bsdgetpgrp>, C<d_bsdsetpgrp>, +C<d_bcopy>, C<d_bsd>, C<d_bsdgetpgrp>, C<d_bsdsetpgrp>, C<d_bzero>, C<d_casti32>, C<d_castneg>, C<d_charvspr>, C<d_chown>, C<d_chroot>, C<d_chsize>, C<d_class>, C<d_closedir>, C<d_cmsghdr_s>, C<d_const>, C<d_crypt>, C<d_crypt_r>, C<d_csh>, C<d_ctermid_r>, @@ -1014,14 +1014,6 @@ #define BIN "/usr/local/bin" /**/ #define BIN_EXP "" /**/ -/* PERL_BINCOMPAT_5005: - * This symbol, if defined, indicates that this version of Perl should be - * binary-compatible with Perl 5.005. This is impossible for builds - * that use features like threads and multiplicity it is always - * for those versions. - */ -/*#define PERL_BINCOMPAT_5005 / **/ - /* BYTEORDER: * This symbol holds the hexadecimal constant defined in byteorder, * in a UV, i.e. 0x1234 or 0x4321 or 0x12345678, etc... @@ -3580,8 +3572,8 @@ * See INSTALL for how this works. * The versioned site_perl directory was introduced in 5.005, * so that is the lowest possible value. - * Since this can depend on compile time options (such as - * bincompat) it is set by Configure. Other non-default sources + * Since this can depend on compile time options + * it is set by Configure. Other non-default sources * of potential incompatibility, such as multiplicity, threads, * debugging, 64bits, sfio, etc., are not checked for currently, * though in principle we could go snooping around in old diff --git a/uconfig.sh b/uconfig.sh index ba3d253ee6..a87be050d3 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -10,7 +10,6 @@ archlibexp='/usr/local/lib/perl5/5.7/unknown' archname='unknown' asctime_r_proto='0' bin='/usr/local/bin' -bincompat5005='define' byteorder='1234' castflags='0' charsize='1' @@ -44,7 +43,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='undef' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/vos/config.alpha.def b/vos/config.alpha.def index ef3acee023..179529afba 100644 --- a/vos/config.alpha.def +++ b/vos/config.alpha.def @@ -36,7 +36,6 @@ $d_atoll='undef' $d_attribut='undef' $d_bcmp='undef' $d_bcopy='undef' -$d_bincompat5005='undef' $d_bsdgetpgrp='undef' $d_bsdsetpgrp='undef' $d_bzero='undef' diff --git a/vos/config.ga.def b/vos/config.ga.def index 885025f89a..3fb3de19b2 100644 --- a/vos/config.ga.def +++ b/vos/config.ga.def @@ -36,7 +36,6 @@ $d_atoll='undef' $d_attribut='undef' $d_bcmp='undef' $d_bcopy='undef' -$d_bincompat5005='undef' $d_bsdgetpgrp='undef' $d_bsdsetpgrp='undef' $d_bzero='undef' diff --git a/win32/config.bc b/win32/config.bc index 69cb885ba2..0952833114 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -34,7 +34,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -98,7 +97,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/win32/config.gc b/win32/config.gc index 014381b507..588a624a94 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -132,7 +132,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -192,7 +191,6 @@ d_atoll='undef' d_attribut='define' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/win32/config.vc b/win32/config.vc index e4e47ecc23..1396feed47 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -34,7 +34,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -98,7 +97,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/win32/config.vc64 b/win32/config.vc64 index 37b05d8928..e834d3427a 100644 --- a/win32/config.vc64 +++ b/win32/config.vc64 @@ -34,7 +34,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -98,7 +97,6 @@ d_atoll='define' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' diff --git a/wince/config.ce b/wince/config.ce index 86ac886773..9e42882296 100644 --- a/wince/config.ce +++ b/wince/config.ce @@ -36,7 +36,6 @@ awk='awk' baserev='5' bash='' bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~' -bincompat5005='undef' binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~' bison='' byacc='byacc' @@ -100,7 +99,6 @@ d_atoll='undef' d_attribut='undef' d_bcmp='undef' d_bcopy='undef' -d_bincompat5005='undef' d_bsd='define' d_bsdgetpgrp='undef' d_bsdsetpgrp='undef' |