This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove obsolete FCRYPT ifdefs and associated PL_cryptseen (#17624)
[perl5.git] / makedef.pl
index 0593342..9af199d 100644 (file)
 #    perl.imp    NetWare
 #    makedef.lis VMS
 
-BEGIN { unshift @INC, "lib" }
-use Config;
-use strict;
-
-my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
-
+my $fold;
+my %ARGS;
 my %define;
 
-my $fold;
+BEGIN {
+    BEGIN { unshift @INC, "lib" }
+    use Config;
+    use strict;
 
-sub process_cc_flags {
-    foreach (map {split /\s+/, $_} @_) {
-       $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/;
-    }
-}
+    %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
 
-while (@ARGV) {
-    my $flag = shift;
-    if ($flag =~ /^(?:CC_FLAGS=)?(-D\w.*)/) {
-       process_cc_flags($1);
-    } elsif ($flag =~ /^(CCTYPE|FILETYPE|PLATFORM|TARG_DIR)=(.+)$/) {
-       $ARGS{$1} = $2;
-    } elsif ($flag eq '--sort-fold') {
-       ++$fold;
+    sub process_cc_flags {
+       foreach (map {split /\s+/, $_} @_) {
+           $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/;
+       }
     }
-}
-
-require "$ARGS{TARG_DIR}regen/embed_lib.pl";
 
-{
-    my @PLATFORM = qw(aix win32 wince os2 netware vms test);
+    while (@ARGV) {
+       my $flag = shift;
+       if ($flag =~ /^(?:CC_FLAGS=)?(-D\w.*)/) {
+           process_cc_flags($1);
+       } elsif ($flag =~ /^(CCTYPE|FILETYPE|PLATFORM|TARG_DIR)=(.+)$/) {
+           $ARGS{$1} = $2;
+       } elsif ($flag eq '--sort-fold') {
+           ++$fold;
+       }
+    }
+    my @PLATFORM = qw(aix win32 os2 netware vms test);
     my %PLATFORM;
     @PLATFORM{@PLATFORM} = ();
 
@@ -71,12 +68,14 @@ require "$ARGS{TARG_DIR}regen/embed_lib.pl";
     die "PLATFORM must be one of: @PLATFORM\n"
        unless exists $PLATFORM{$ARGS{PLATFORM}};
 }
+use constant PLATFORM => $ARGS{PLATFORM};
+
+require "./$ARGS{TARG_DIR}regen/embed_lib.pl";
 
 # Is the following guard strictly necessary? Added during refactoring
 # to keep the same behaviour when merging other code into here.
 process_cc_flags(@Config{qw(ccflags optimize)})
-    if $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'wince'
-    && $ARGS{PLATFORM} ne 'netware';
+    if $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'netware';
 
 # Add the compile-time options that miniperl was built with to %define.
 # On Win32 these are not the same options as perl itself will be built
@@ -101,10 +100,10 @@ my %exportperlmalloc =
 
 my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2';
 
-open(CFG, '<', 'config.h') || die "Cannot open config.h: $!\n";
+my $config_h = 'config.h';
+open(CFG, '<', $config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
     $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY
-                                           |SPRINTF_RETURNS_STRLEN
                                            |KILL_BY_SIGPRC
                                            |(?:PERL|USE|HAS)_\w+)\b/x;
 }
@@ -122,10 +121,48 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_ITHREADS} ||
     $define{MULTIPLICITY} ;
 
-if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') {
+if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'netware') {
     $define{USE_REENTRANT_API} = 1;
 }
 
+if (! $define{NO_LOCALE}) {
+    if ( ! $define{NO_POSIX_2008_LOCALE}
+        && $define{HAS_NEWLOCALE}
+        && $define{HAS_USELOCALE}
+        && $define{HAS_DUPLOCALE}
+        && $define{HAS_FREELOCALE})
+    {
+        $define{HAS_POSIX_2008_LOCALE} = 1;
+        $define{USE_LOCALE} = 1;
+    }
+    elsif ($define{HAS_SETLOCALE}) {
+        $define{USE_LOCALE} = 1;
+    }
+}
+
+# https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering
+my $cctype = $ARGS{CCTYPE} =~ s/MSVC//r;
+if (! $define{HAS_SETLOCALE} && $define{HAS_POSIX_2008_LOCALE}) {
+    $define{USE_POSIX_2008_LOCALE} = 1;
+    $define{USE_THREAD_SAFE_LOCALE} = 1;
+}
+elsif (   ($define{USE_ITHREADS} || $define{USE_THREAD_SAFE_LOCALE})
+       && (    $define{HAS_POSIX_2008_LOCALE}
+           || ($ARGS{PLATFORM} eq 'win32' && (   $cctype !~ /\D/
+                                              && $cctype >= 80)))
+       && ! $define{NO_THREAD_SAFE_LOCALE})
+{
+    $define{USE_THREAD_SAFE_LOCALE} = 1 unless $define{USE_THREAD_SAFE_LOCALE};
+    $define{USE_POSIX_2008_LOCALE} = 1 if $define{HAS_POSIX_2008_LOCALE};
+}
+
+if (   $ARGS{PLATFORM} eq 'win32'
+    && $define{USE_THREAD_SAFE_LOCALE}
+    && $cctype < 140)
+{
+    $define{TS_W32_BROKEN_LOCALECONV} = 1;
+}
+
 # perl.h logic duplication ends
 
 print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n"
@@ -167,7 +204,7 @@ sub readvar {
     my $file = $ARGS{TARG_DIR} . shift;
     my $hash = shift;
     my $proc = shift;
-    open my $vars, '<', $file or die die "Cannot open $file: $!\n";
+    open my $vars, '<', $file or die "Cannot open $file: $!\n";
 
     while (<$vars>) {
        # All symbols have a Perl_ prefix because that's what embed.h sticks
@@ -182,9 +219,7 @@ sub readvar {
 
 if ($ARGS{PLATFORM} ne 'os2') {
     ++$skip{$_} foreach qw(
-                    PL_cryptseen
                     PL_opsave
-                    Perl_GetVars
                     Perl_dump_fds
                     Perl_my_bcopy
                     Perl_my_bzero
@@ -202,13 +237,13 @@ if ($ARGS{PLATFORM} ne 'os2') {
         ++$skip{Perl_my_symlink} unless $Config{d_symlink};
     } else {
        ++$skip{PL_statusvalue_vms};
+       ++$skip{PL_perllib_sep};
        if ($ARGS{PLATFORM} ne 'aix') {
            ++$skip{$_} foreach qw(
                                PL_DBcv
                                PL_generation
                                PL_lastgotoprobe
                                PL_modcount
-                               PL_timesbuf
                                main
                                 );
        }
@@ -231,6 +266,12 @@ if ($ARGS{PLATFORM} ne 'vms') {
     }
 }
 
+if ($ARGS{PLATFORM} ne 'win32') {
+    ++$skip{$_} foreach qw(
+                   Perl_my_setlocale
+                        );
+}
+
 unless ($define{UNLINK_ALL_VERSIONS}) {
     ++$skip{Perl_unlnk};
 }
@@ -243,10 +284,11 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debstackptrs
                    Perl_pad_sv
                    Perl_pad_setsv
+                    Perl__setlocale_debug_string
+                   Perl_set_padlist
                    Perl_hv_assert
                    PL_watchaddr
                    PL_watchok
-                   PL_watch_pvx
                         );
 }
 
@@ -274,12 +316,11 @@ else {
                         );
 }
 
-unless ($define{'PERL_OLD_COPY_ON_WRITE'}
-     || $define{'PERL_NEW_COPY_ON_WRITE'}) {
+if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) {
     ++$skip{Perl_sv_setsv_cow};
 }
 
-unless ($define{PERL_SAW_AMPERSAND}) {
+unless ($define{PERL_SAWAMPERSAND}) {
     ++$skip{PL_sawampersand};
 }
 
@@ -316,50 +357,30 @@ if ($define{'PERL_USE_SAFE_PUTENV'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{PL_thr_key};
+    ++$skip{PL_user_prop_mutex};
+    ++$skip{PL_user_def_props_aTHX};
 }
 
-# USE_5005THREADS symbols. Kept as reference for easier removal
-++$skip{$_} foreach qw(
-                   PL_sv_mutex
-                   PL_strtab_mutex
-                   PL_svref_mutex
-                   PL_cred_mutex
-                   PL_eval_mutex
-                   PL_fdpid_mutex
-                   PL_sv_lock_mutex
-                   PL_eval_cond
-                   PL_eval_owner
-                   PL_threads_mutex
-                   PL_nthreads
-                   PL_nthreads_cond
-                   PL_threadnum
-                   PL_threadsv_names
-                   PL_thrsv
-                   PL_vtbl_mutex
-                   Perl_condpair_magic
-                   Perl_new_struct_thread
-                   Perl_per_thread_magicals
-                   Perl_thread_create
-                   Perl_find_threadsv
-                   Perl_unlock_condpair
-                   Perl_magic_mutexfree
-                   Perl_sv_lock
-                    );
-
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{$_} foreach qw(
+                    PL_keyword_plugin_mutex
                    PL_check_mutex
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
                    PL_dollarzero_mutex
+                   PL_env_mutex
                    PL_hints_mutex
+                   PL_locale_mutex
+                   PL_lc_numeric_mutex
+                   PL_lc_numeric_mutex_depth
                    PL_my_ctx_mutex
                    PL_perlio_mutex
                    PL_stashpad
                    PL_stashpadix
                    PL_stashpadmax
                    Perl_alloccopstash
+                   Perl_allocfilegv
                    Perl_clone_params_del
                    Perl_clone_params_new
                    Perl_parser_dup
@@ -386,12 +407,33 @@ unless ($define{'USE_ITHREADS'}) {
                         );
 }
 
+if (      $define{NO_LOCALE}
+    || (! $define{USE_ITHREADS} && ! $define{USE_THREAD_SAFE_LOCALE}))
+{
+    ++$skip{$_} foreach qw(
+        PL_C_locale_obj
+        PL_curlocales
+    );
+}
+
+unless ( $define{'HAS_NEWLOCALE'}
+    &&   $define{'HAS_FREELOCALE'}
+    &&   $define{'HAS_USELOCALE'}
+    && ! $define{'NO_POSIX_2008_LOCALE'})
+{
+    ++$skip{$_} foreach qw(
+        PL_C_locale_obj
+        PL_underlying_numeric_obj
+    );
+}
+
 unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
     ++$skip{$_} foreach qw(
                    PL_my_cxt_index
                    PL_my_cxt_list
                    PL_my_cxt_size
                    PL_my_cxt_keys
+                   PL_my_cxt_keys_size
                    Perl_croak_nocontext
                    Perl_die_nocontext
                    Perl_deb_nocontext
@@ -410,12 +452,21 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                         );
 }
 
-unless ($define{'PERL_NEED_APPCTX'}) {
-    ++$skip{PL_appctx};
+if ($define{USE_THREAD_SAFE_LOCALE}) {
+    ++$skip{PL_lc_numeric_mutex};
+    ++$skip{PL_lc_numeric_mutex_depth};
+    if (! $define{TS_W32_BROKEN_LOCALECONV}) {
+        ++$skip{PL_locale_mutex};
+    }
 }
 
-unless ($define{'PERL_NEED_TIMESBASE'}) {
-    ++$skip{PL_timesbase};
+unless ($define{'USE_DTRACE'}) {
+    ++$skip{$_} foreach qw(
+                    Perl_dtrace_probe_call
+                    Perl_dtrace_probe_load
+                    Perl_dtrace_probe_op
+                    Perl_dtrace_probe_phase
+                );
 }
 
 unless ($define{'DEBUG_LEAKING_SCALARS'}) {
@@ -430,10 +481,6 @@ unless ($define{'PERL_DONT_CREATE_GVSV'}) {
     ++$skip{Perl_gv_SVadd};
 }
 
-if ($define{'SPRINTF_RETURNS_STRLEN'}) {
-    ++$skip{Perl_my_sprintf};
-}
-
 unless ($define{'PERL_USES_PL_PIDSTATUS'}) {
     ++$skip{PL_pidstatus};
 }
@@ -442,28 +489,14 @@ unless ($define{'PERL_TRACK_MEMPOOL'}) {
     ++$skip{PL_memory_debug_header};
 }
 
-unless ($define{PERL_MAD}) {
-    ++$skip{$_} foreach qw(
-                   PL_madskills
-                   PL_xmlfp
-                        );
-}
-
 unless ($define{'MULTIPLICITY'}) {
     ++$skip{$_} foreach qw(
                    PL_interp_size
-                   PL_interp_size_5_16_0
-                        );
-}
-
-unless ($define{'PERL_GLOBAL_STRUCT'}) {
-    ++$skip{PL_global_struct_size};
-}
-
-unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) {
-    ++$skip{$_} foreach qw(
-                   PL_my_cxt_keys
-                   Perl_my_cxt_index
+                   PL_interp_size_5_18_0
+                    PL_sv_yes
+                    PL_sv_undef
+                    PL_sv_no
+                    PL_sv_zero
                         );
 }
 
@@ -490,6 +523,11 @@ if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) {
     ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION};
 }
 
+if ($define{'HAS_STRNLEN'})
+{
+    ++$skip{Perl_my_strnlen};
+}
+
 unless ($define{USE_LOCALE_COLLATE}) {
     ++$skip{$_} foreach qw(
                    PL_collation_ix
@@ -499,6 +537,9 @@ unless ($define{USE_LOCALE_COLLATE}) {
                    PL_collxfrm_mult
                    Perl_sv_collxfrm
                    Perl_sv_collxfrm_flags
+                    PL_strxfrm_NUL_replacement
+                    PL_strxfrm_is_behaved
+                    PL_strxfrm_max_cp
                         );
 }
 
@@ -508,9 +549,17 @@ unless ($define{USE_LOCALE_NUMERIC}) {
                    PL_numeric_name
                    PL_numeric_radix_sv
                    PL_numeric_standard
+                    PL_numeric_underlying
+                    PL_numeric_underlying_is_standard
+                    PL_underlying_numeric_obj
                         );
 }
 
+unless ($define{'USE_C_BACKTRACE'}) {
+    ++$skip{Perl_get_c_backtrace_dump};
+    ++$skip{Perl_dump_c_backtrace};
+}
+
 unless ($define{HAVE_INTERP_INTERN}) {
     ++$skip{$_} foreach qw(
                    Perl_sys_intern_clear
@@ -524,16 +573,11 @@ if ($define{HAS_SIGNBIT}) {
     ++$skip{Perl_signbit};
 }
 
-if ($define{'PERL_GLOBAL_STRUCT'}) {
-    readvar('perlvars.h', \%skip);
-    # This seems like the least ugly way to cope with the fact that PL_sh_path
-    # is mentioned in perlvar.h and globvar.sym, and always exported.
-    delete $skip{PL_sh_path};
-    ++$export{Perl_GetVars};
-    try_symbols(qw(PL_Vars PL_VarsPtr)) unless $ARGS{CCTYPE} eq 'GCC';
-} else {
-    ++$skip{$_} foreach qw(Perl_init_global_struct Perl_free_global_struct);
-}
+++$skip{PL_op_exec_cnt}
+    unless $define{PERL_TRACE_OPS};
+
+++$skip{PL_hash_chars}
+    unless $define{PERL_USE_SINGLE_CHAR_HASH_CACHE};
 
 # functions from *.sym files
 
@@ -606,6 +650,8 @@ my @layer_syms = qw(
                    Perl_PerlIO_get_cnt
                    Perl_PerlIO_get_ptr
                    Perl_PerlIO_read
+                   Perl_PerlIO_restore_errno
+                   Perl_PerlIO_save_errno
                    Perl_PerlIO_seek
                    Perl_PerlIO_set_cnt
                    Perl_PerlIO_set_ptrcnt
@@ -621,113 +667,29 @@ if ($ARGS{PLATFORM} eq 'netware') {
     push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio');
 }
 
-if ($define{'USE_PERLIO'}) {
-    # Export the symols that make up the PerlIO abstraction, regardless
-    # of its implementation - read from a file
-    push @syms, 'perlio.sym';
-
-    # This part is then dependent on how the abstraction is implemented
-    if ($define{'USE_SFIO'}) {
-       # Old legacy non-stdio "PerlIO"
-       ++$skip{$_} foreach @layer_syms;
-       ++$skip{perlsio_binmode};
-       # SFIO defines most of the PerlIO routines as macros
-       # So undo most of what $perlio_sym has just done - d'oh !
-       # Perhaps it would be better to list the ones which do exist
-       # And emit them
-       ++$skip{$_} foreach qw(
-                        PerlIO_canset_cnt
-                        PerlIO_clearerr
-                        PerlIO_close
-                        PerlIO_eof
-                        PerlIO_error
-                        PerlIO_exportFILE
-                        PerlIO_fast_gets
-                        PerlIO_fdopen
-                        PerlIO_fileno
-                        PerlIO_findFILE
-                        PerlIO_flush
-                        PerlIO_get_base
-                        PerlIO_get_bufsiz
-                        PerlIO_get_cnt
-                        PerlIO_get_ptr
-                        PerlIO_getc
-                        PerlIO_getname
-                        PerlIO_has_base
-                        PerlIO_has_cntptr
-                        PerlIO_importFILE
-                        PerlIO_open
-                        PerlIO_printf
-                        PerlIO_putc
-                        PerlIO_puts
-                        PerlIO_read
-                        PerlIO_releaseFILE
-                        PerlIO_reopen
-                        PerlIO_rewind
-                        PerlIO_seek
-                        PerlIO_set_cnt
-                        PerlIO_set_ptrcnt
-                        PerlIO_setlinebuf
-                        PerlIO_sprintf
-                        PerlIO_stderr
-                        PerlIO_stdin
-                        PerlIO_stdout
-                        PerlIO_stdoutf
-                        PerlIO_tell
-                        PerlIO_ungetc
-                        PerlIO_vprintf
-                        PerlIO_write
-                        PerlIO_perlio
-                        Perl_PerlIO_clearerr
-                        Perl_PerlIO_close
-                        Perl_PerlIO_eof
-                        Perl_PerlIO_error
-                        Perl_PerlIO_fileno
-                        Perl_PerlIO_fill
-                        Perl_PerlIO_flush
-                        Perl_PerlIO_get_base
-                        Perl_PerlIO_get_bufsiz
-                        Perl_PerlIO_get_cnt
-                        Perl_PerlIO_get_ptr
-                        Perl_PerlIO_read
-                        Perl_PerlIO_seek
-                        Perl_PerlIO_set_cnt
-                        Perl_PerlIO_set_ptrcnt
-                        Perl_PerlIO_setlinebuf
-                        Perl_PerlIO_stderr
-                        Perl_PerlIO_stdin
-                        Perl_PerlIO_stdout
-                        Perl_PerlIO_tell
-                        Perl_PerlIO_unread
-                        Perl_PerlIO_write
-                         PL_def_layerlist
-                         PL_known_layers
-                         PL_perlio
-                            );
-    }
-    else {
-       # PerlIO with layers - export implementation
-       try_symbols(@layer_syms, 'perlsio_binmode');
-    }
-} else {
-       # -Uuseperlio
-       # Skip the PerlIO layer symbols - although
-       # nothing should have exported them anyway.
-       ++$skip{$_} foreach @layer_syms;
-       ++$skip{$_} foreach qw(
-                       perlsio_binmode
-                       PL_def_layerlist
-                       PL_known_layers
-                       PL_perlio
-                       PL_perlio_debug_fd
-                       PL_perlio_fd_refcnt
-                       PL_perlio_fd_refcnt_size
-                       PL_perlio_mutex
-                            );
+# Export the symbols that make up the PerlIO abstraction, regardless
+# of its implementation - read from a file
+push @syms, 'perlio.sym';
+
+# PerlIO with layers - export implementation
+try_symbols(@layer_syms, 'perlsio_binmode');
+
 
-       # Also do NOT add abstraction symbols from $perlio_sym
-       # abstraction is done as #define to stdio
-       # Remaining remnants that _may_ be functions are handled below.
+unless ($define{'USE_QUADMATH'}) {
+  ++$skip{Perl_quadmath_format_needed};
+  ++$skip{Perl_quadmath_format_single};
+}
+
+unless ($Config{d_mbrlen}) {
+    ++$skip{PL_mbrlen_ps};
+}
+
+unless ($Config{d_mbrtowc}) {
+    ++$skip{PL_mbrtowc_ps};
+}
+
+unless ($Config{d_wcrtomb}) {
+    ++$skip{PL_wcrtomb_ps};
 }
 
 ###############################################################################
@@ -738,11 +700,14 @@ if ($define{'USE_PERLIO'}) {
 {
     my %seen;
     my ($embed) = setup_embed($ARGS{TARG_DIR});
+    my $excludedre = $define{'NO_MATHOMS'} ? qr/[emib]/ : qr/[emi]/;
 
     foreach (@$embed) {
        my ($flags, $retval, $func, @args) = @$_;
        next unless $func;
-       if ($flags =~ /[AX]/ && $flags !~ /[xm]/ || $flags =~ /b/) {
+       if (($flags =~ /[AXC]/ && $flags !~ $excludedre)
+            || (!$define{'NO_MATHOMS'} && $flags =~ /b/))
+        {
            # public API, so export
 
            # If a function is defined twice, for example before and after
@@ -750,7 +715,8 @@ if ($define{'USE_PERLIO'}) {
            # within the block, as the *first* definition may have flags which
            # mean "don't export"
            next if $seen{$func}++;
-           $func = "Perl_$func" if $flags =~ /[pbX]/;
+           # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ?
+           $func = "Perl_$func" if ($flags =~ /[pX]/ && $func !~ /^Perl_/);
            ++$export{$func} unless exists $skip{$func};
        }
     }
@@ -759,32 +725,18 @@ if ($define{'USE_PERLIO'}) {
 foreach (@syms) {
     my $syms = $ARGS{TARG_DIR} . $_;
     open my $global, '<', $syms or die "failed to open $syms: $!\n";
-    # Functions already have a Perl_ prefix
-    # Variables need a PL_ prefix
-    my $prefix = $syms =~ /var\.sym$/i ? 'PL_' : '';
     while (<$global>) {
        next unless /^([A-Za-z].*)/;
-       my $symbol = "$prefix$1";
+       my $symbol = "$1";
        ++$export{$symbol} unless exists $skip{$symbol};
     }
 }
 
 # variables
 
-if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) {
-    readvar('perlvars.h', \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
-    # XXX AIX seems to want the perlvars.h symbols, for some reason
-    if ($ARGS{PLATFORM} eq 'aix' or $ARGS{PLATFORM} eq 'os2') {        # OS/2 needs PL_thr_key
-       readvar('perlvars.h', \%export);
-    }
-}
-else {
-    unless ($define{'PERL_GLOBAL_STRUCT'}) {
-       readvar('perlvars.h', \%export);
-    }
-    unless ($define{MULTIPLICITY}) {
-       readvar('intrpvar.h', \%export);
-    }
+readvar('perlvars.h', \%export);
+unless ($define{MULTIPLICITY}) {
+    readvar('intrpvar.h', \%export);
 }
 
 # Oddities from PerlIO
@@ -795,176 +747,169 @@ try_symbols(qw(
                    PerlIO_getpos
                    PerlIO_init
                    PerlIO_setpos
-                   PerlIO_sprintf
                    PerlIO_tmpfile
-                   PerlIO_vsprintf
             ));
 
 if ($ARGS{PLATFORM} eq 'win32') {
     try_symbols(qw(
-                                win32_free_childdir
-                                win32_free_childenv
-                                win32_get_childdir
-                                win32_get_childenv
-                                win32_spawnvp
-                ));
-}
-
-if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
-    try_symbols(qw(
-                           Perl_init_os_extras
-                           Perl_thread_create
-                           Perl_win32_init
-                           Perl_win32_term
-                           RunPerl
-                           win32_async_check
-                           win32_errno
-                           win32_environ
-                           win32_abort
-                           win32_fstat
-                           win32_stat
-                           win32_pipe
-                           win32_popen
-                           win32_pclose
-                           win32_rename
-                           win32_setmode
-                           win32_chsize
-                           win32_lseek
-                           win32_tell
-                           win32_dup
-                           win32_dup2
-                           win32_open
-                           win32_close
-                           win32_eof
-                           win32_isatty
-                           win32_read
-                           win32_write
-                           win32_mkdir
-                           win32_rmdir
-                           win32_chdir
-                           win32_flock
-                           win32_execv
-                           win32_execvp
-                           win32_htons
-                           win32_ntohs
-                           win32_htonl
-                           win32_ntohl
-                           win32_inet_addr
-                           win32_inet_ntoa
-                           win32_socket
-                           win32_bind
-                           win32_listen
-                           win32_accept
-                           win32_connect
-                           win32_send
-                           win32_sendto
-                           win32_recv
-                           win32_recvfrom
-                           win32_shutdown
-                           win32_closesocket
-                           win32_ioctlsocket
-                           win32_setsockopt
-                           win32_getsockopt
-                           win32_getpeername
-                           win32_getsockname
-                           win32_gethostname
-                           win32_gethostbyname
-                           win32_gethostbyaddr
-                           win32_getprotobyname
-                           win32_getprotobynumber
-                           win32_getservbyname
-                           win32_getservbyport
-                           win32_select
-                           win32_endhostent
-                           win32_endnetent
-                           win32_endprotoent
-                           win32_endservent
-                           win32_getnetent
-                           win32_getnetbyname
-                           win32_getnetbyaddr
-                           win32_getprotoent
-                           win32_getservent
-                           win32_sethostent
-                           win32_setnetent
-                           win32_setprotoent
-                           win32_setservent
-                           win32_getenv
-                           win32_putenv
-                           win32_perror
-                           win32_malloc
-                           win32_calloc
-                           win32_realloc
-                           win32_free
-                           win32_sleep
-                           win32_times
-                           win32_access
-                           win32_alarm
-                           win32_chmod
-                           win32_open_osfhandle
-                           win32_get_osfhandle
-                           win32_ioctl
-                           win32_link
-                           win32_unlink
-                           win32_utime
-                           win32_gettimeofday
-                           win32_uname
-                           win32_wait
-                           win32_waitpid
-                           win32_kill
-                           win32_str_os_error
-                           win32_opendir
-                           win32_readdir
-                           win32_telldir
-                           win32_seekdir
-                           win32_rewinddir
-                           win32_closedir
-                           win32_longpath
-                           win32_ansipath
-                           win32_os_id
-                           win32_getpid
-                           win32_crypt
-                           win32_dynaload
-                           win32_clearenv
-                           win32_stdin
-                           win32_stdout
-                           win32_stderr
-                           win32_ferror
-                           win32_feof
-                           win32_strerror
-                           win32_fprintf
-                           win32_printf
-                           win32_vfprintf
-                           win32_vprintf
-                           win32_fread
-                           win32_fwrite
-                           win32_fopen
-                           win32_fdopen
-                           win32_freopen
-                           win32_fclose
-                           win32_fputs
-                           win32_fputc
-                           win32_ungetc
-                           win32_getc
-                           win32_fileno
-                           win32_clearerr
-                           win32_fflush
-                           win32_ftell
-                           win32_fseek
-                           win32_fgetpos
-                           win32_fsetpos
-                           win32_rewind
-                           win32_tmpfile
-                           win32_setbuf
-                           win32_setvbuf
-                           win32_flushall
-                           win32_fcloseall
-                           win32_fgets
-                           win32_gets
-                           win32_fgetc
-                           win32_putc
-                           win32_puts
-                           win32_getchar
-                           win32_putchar
+                   win32_free_childdir
+                   win32_free_childenv
+                   win32_get_childdir
+                   win32_get_childenv
+                   win32_spawnvp
+                   Perl_init_os_extras
+                   Perl_win32_init
+                   Perl_win32_term
+                   RunPerl
+                   win32_async_check
+                   win32_errno
+                   win32_environ
+                   win32_abort
+                   win32_fstat
+                   win32_stat
+                   win32_pipe
+                   win32_popen
+                   win32_pclose
+                   win32_rename
+                   win32_setmode
+                   win32_chsize
+                   win32_lseek
+                   win32_tell
+                   win32_dup
+                   win32_dup2
+                   win32_open
+                   win32_close
+                   win32_eof
+                   win32_isatty
+                   win32_read
+                   win32_write
+                   win32_mkdir
+                   win32_rmdir
+                   win32_chdir
+                   win32_flock
+                   win32_execv
+                   win32_execvp
+                   win32_htons
+                   win32_ntohs
+                   win32_htonl
+                   win32_ntohl
+                   win32_inet_addr
+                   win32_inet_ntoa
+                   win32_socket
+                   win32_bind
+                   win32_listen
+                   win32_accept
+                   win32_connect
+                   win32_send
+                   win32_sendto
+                   win32_recv
+                   win32_recvfrom
+                   win32_shutdown
+                   win32_closesocket
+                   win32_ioctlsocket
+                   win32_setsockopt
+                   win32_getsockopt
+                   win32_getpeername
+                   win32_getsockname
+                   win32_gethostname
+                   win32_gethostbyname
+                   win32_gethostbyaddr
+                   win32_getprotobyname
+                   win32_getprotobynumber
+                   win32_getservbyname
+                   win32_getservbyport
+                   win32_select
+                   win32_endhostent
+                   win32_endnetent
+                   win32_endprotoent
+                   win32_endservent
+                   win32_getnetent
+                   win32_getnetbyname
+                   win32_getnetbyaddr
+                   win32_getprotoent
+                   win32_getservent
+                   win32_sethostent
+                   win32_setnetent
+                   win32_setprotoent
+                   win32_setservent
+                   win32_getenv
+                   win32_putenv
+                   win32_perror
+                   win32_malloc
+                   win32_calloc
+                   win32_realloc
+                   win32_free
+                   win32_sleep
+                   win32_pause
+                   win32_times
+                   win32_access
+                   win32_alarm
+                   win32_chmod
+                   win32_open_osfhandle
+                   win32_get_osfhandle
+                   win32_ioctl
+                   win32_link
+                   win32_unlink
+                   win32_utime
+                   win32_gettimeofday
+                   win32_uname
+                   win32_wait
+                   win32_waitpid
+                   win32_kill
+                   win32_str_os_error
+                   win32_opendir
+                   win32_readdir
+                   win32_telldir
+                   win32_seekdir
+                   win32_rewinddir
+                   win32_closedir
+                   win32_longpath
+                   win32_ansipath
+                   win32_os_id
+                   win32_getpid
+                   win32_crypt
+                   win32_dynaload
+                   win32_clearenv
+                   win32_stdin
+                   win32_stdout
+                   win32_stderr
+                   win32_ferror
+                   win32_feof
+                   win32_strerror
+                   win32_fprintf
+                   win32_printf
+                   win32_vfprintf
+                   win32_vprintf
+                   win32_fread
+                   win32_fwrite
+                   win32_fopen
+                   win32_fdopen
+                   win32_freopen
+                   win32_fclose
+                   win32_fputs
+                   win32_fputc
+                   win32_ungetc
+                   win32_getc
+                   win32_fileno
+                   win32_clearerr
+                   win32_fflush
+                   win32_ftell
+                   win32_fseek
+                   win32_fgetpos
+                   win32_fsetpos
+                   win32_rewind
+                   win32_tmpfile
+                   win32_setbuf
+                   win32_setvbuf
+                   win32_flushall
+                   win32_fcloseall
+                   win32_fgets
+                   win32_gets
+                   win32_fgetc
+                   win32_putc
+                   win32_puts
+                   win32_getchar
+                   win32_putchar
                 ));
 }
 elsif ($ARGS{PLATFORM} eq 'vms') {
@@ -994,11 +939,11 @@ elsif ($ARGS{PLATFORM} eq 'vms') {
                      Perl_my_gconvert
                      Perl_my_getenv
                      Perl_my_getenv_len
-                     Perl_my_getlogin
                      Perl_my_getpwnam
                      Perl_my_getpwuid
                      Perl_my_gmtime
                      Perl_my_kill
+                     Perl_my_killpg
                      Perl_my_localtime
                      Perl_my_mkdir
                      Perl_my_sigaction
@@ -1124,7 +1069,6 @@ elsif ($ARGS{PLATFORM} eq 'os2') {
 elsif ($ARGS{PLATFORM} eq 'netware') {
     try_symbols(qw(
                        Perl_init_os_extras
-                       Perl_thread_create
                        Perl_nw5_init
                        RunPerl
                        AllocStdPerl
@@ -1260,17 +1204,15 @@ elsif ($ARGS{PLATFORM} eq 'netware') {
                 ));
 }
 
-# When added this code was only run for Win32 and WinCE
+# When added this code was only run for Win32 (and WinCE at the time)
 # Currently only Win32 links static extensions into the shared library.
-# The WinCE makefile doesn't appear to support static extensions, so this code
-# can't have any effect there.
 # The NetWare Makefile doesn't support static extensions (and hardcodes the
 # list of dynamic extensions, and the rules to build them)
 # For *nix (and presumably OS/2) with a shared libperl, Makefile.SH compiles
 # static extensions with -fPIC, but links them to perl, not libperl.so
 # The VMS build scripts don't yet implement static extensions at all.
 
-if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
+if ($ARGS{PLATFORM} eq 'win32') {
     # records of type boot_module for statically linked modules (except Dynaloader)
     my $static_ext = $Config{static_ext} // "";
     $static_ext =~ s/\//__/g;
@@ -1281,7 +1223,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
 
 if ($ARGS{PLATFORM} eq 'os2') {
     my (%mapped, @missing);
-    open MAP, 'miniperl.map' or die 'Cannot read miniperl.map';
+    open MAP, '<', 'miniperl.map' or die 'Cannot read miniperl.map';
     /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>;
     close MAP or die 'Cannot close miniperl.map';
 
@@ -1297,13 +1239,13 @@ if ($ARGS{PLATFORM} eq 'os2') {
 
 # Start with platform specific headers:
 
-if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
+if ($ARGS{PLATFORM} eq 'win32') {
     my $dll = $define{PERL_DLL} ? $define{PERL_DLL} =~ s/\.dll$//ir
        : "perl$Config{api_revision}$Config{api_version}";
     print "LIBRARY $dll\n";
     # The DESCRIPTION module definition file statement is not supported
     # by VC7 onwards.
-    if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) {
+    if ($ARGS{CCTYPE} eq 'GCC') {
        print "DESCRIPTION 'Perl interpreter'\n";
     }
     print "EXPORTS\n";
@@ -1347,10 +1289,16 @@ elsif ($ARGS{PLATFORM} eq 'netware') {
 
 my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export;
 foreach my $symbol (@symbols) {
-    if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
-       print "\t$symbol\n";
+    if (PLATFORM eq 'win32') {
+       # Remembering the origin file of each symbol is an alternative to PL_ matching
+       if (substr($symbol, 0, 3) eq 'PL_') {
+           print "\t$symbol DATA\n";
+       }
+       else {
+           print "\t$symbol\n";
+       }
     }
-    elsif ($ARGS{PLATFORM} eq 'os2') {
+    elsif (PLATFORM eq 'os2') {
        printf qq(    %-31s \@%s\n),
          qq("$symbol"), $ordinal{$symbol} || ++$sym_ord;
        printf qq(    %-31s \@%s\n),
@@ -1358,7 +1306,7 @@ foreach my $symbol (@symbols) {
          $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord
          if $exportperlmalloc and exists $exportperlmalloc{$symbol};
     }
-    elsif ($ARGS{PLATFORM} eq 'netware') {
+    elsif (PLATFORM eq 'netware') {
        print "\t$symbol,\n";
     } else {
        print "$symbol\n";