This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
RE: Problem in Win32CORE when building PAR-Packer-0.975 with bleadperl on Win32
[perl5.git] / makedef.pl
index d239d16..b16a0aa 100644 (file)
@@ -1,3 +1,4 @@
+#./perl -w
 #
 # Create the export list for perl.
 #
@@ -5,11 +6,15 @@
 # and by AIX for creating libperl.a when -Dusershrplib is in effect,
 # and by MacOS Classic.
 #
-# reads global.sym, pp.sym, perlvars.h, intrpvar.h, thrdvar.h, config.h
+# reads global.sym, pp.sym, perlvars.h, intrpvar.h, config.h
 # On OS/2 reads miniperl.map and the previous version of perl5.def as well
 
-my $PLATFORM;
-my $CCTYPE;
+BEGIN { unshift @INC, "lib" }
+use strict;
+
+use vars qw($PLATFORM $CCTYPE $FILETYPE $CONFIG_ARGS $ARCHNAME $PATCHLEVEL);
+
+my (%define, %ordinal);
 
 while (@ARGV) {
     my $flag = shift;
@@ -36,6 +41,25 @@ my %PLATFORM;
 defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n";
 exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
 
+if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' or $PLATFORM eq "aix") {
+       # 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
+       # with since miniperl is built with a canned config (one of the win32/
+       # config_H.*) and none of the BUILDOPT's that are set in the makefiles,
+       # but they do include some #define's that are hard-coded in various
+       # source files and header files and don't include any BUILDOPT's that
+       # the user might have chosen to disable because the canned configs are
+       # minimal configs that don't include any of those options.
+       my $opts = ($PLATFORM eq 'wince' ? '-MCross' : ''); # for wince need Cross.pm to get Config.pm
+       my $config = `$^X $opts -Ilib -V`;
+       my($options) = $config =~ /^  Compile-time options: (.*?)\n^  \S/ms;
+       $options =~ s/\s+/ /g;
+       print STDERR "Options: ($options)\n";
+       foreach (split /\s+/, $options) {
+               $define{$_} = 1;
+       }
+}
+
 my %exportperlmalloc =
     (
        Perl_malloc             =>      "malloc",
@@ -48,27 +72,27 @@ my $exportperlmalloc = $PLATFORM eq 'os2';
 
 my $config_sh   = "config.sh";
 my $config_h    = "config.h";
-my $thrdvar_h   = "thrdvar.h";
 my $intrpvar_h  = "intrpvar.h";
 my $perlvars_h  = "perlvars.h";
 my $global_sym  = "global.sym";
 my $pp_sym      = "pp.sym";
 my $globvar_sym = "globvar.sym";
 my $perlio_sym  = "perlio.sym";
+my $static_ext = "";
 
 if ($PLATFORM eq 'aix') {
     # Nothing for now.
 }
 elsif ($PLATFORM =~ /^win(?:32|ce)$/ || $PLATFORM eq 'netware') {
     $CCTYPE = "MSVC" unless defined $CCTYPE;
-    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
-               $pp_sym, $globvar_sym, $perlio_sym) {
+    foreach ($intrpvar_h, $perlvars_h, $global_sym,
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!..\\!;
     }
 }
 elsif ($PLATFORM eq 'MacOS') {
-    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
-               $pp_sym, $globvar_sym, $perlio_sym) {
+    foreach ($intrpvar_h, $perlvars_h, $global_sym,
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!::!;
     }
 }
@@ -80,6 +104,9 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' ||
            $_ = $1;
            $define{$1} = 1 while /-D(\w+)/g;
        }
+        if (/^(d_(?:mmap|sigaction))='(.+)'$/) {
+            $define{$1} = $2;
+        }
        if ($PLATFORM eq 'os2') {
            $CONFIG_ARGS = $1 if /^config_args='(.+)'$/;
            $ARCHNAME =    $1 if /^archname='(.+)'$/;
@@ -88,6 +115,13 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' ||
     }
     close(CFG);
 }
+if ($PLATFORM eq 'win32' || $PLATFORM eq 'wince') {
+    open(CFG,"<..\\$config_sh") || die "Cannot open ..\\$config_sh: $!\n";
+    if ((join '', <CFG>) =~ /^static_ext='(.*)'$/m) {
+        $static_ext = $1;
+    }
+    close(CFG);
+}
 
 open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
@@ -122,11 +156,16 @@ if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
 
 my $sym_ord = 0;
 
+print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n";
+
 if ($PLATFORM =~ /^win(?:32|ce)$/) {
-    warn join(' ',keys %define)."\n";
-    ($dll = ($define{PERL_DLL} || "perl59")) =~ s/\.dll$//i;
+    (my $dll = ($define{PERL_DLL} || "perl59")) =~ s/\.dll$//i;
     print "LIBRARY $dll\n";
-    print "DESCRIPTION 'Perl interpreter'\n";
+    # The DESCRIPTION module definition file statement is not supported
+    # by VC7 onwards.
+    if ($CCTYPE !~ /^MSVC7/ && $CCTYPE !~ /^MSVC8/) {
+       print "DESCRIPTION 'Perl interpreter'\n";
+    }
     print "EXPORTS\n";
     if ($define{PERL_IMPLICIT_SYS}) {
        output_symbol("perl_get_host_info");
@@ -148,11 +187,11 @@ elsif ($PLATFORM eq 'os2') {
       }
       $sym_ord < $_ and $sym_ord = $_ for values %ordinal; # Take the max
     }
-    ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
+    (my $v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
     $v .= '-thread' if $ARCHNAME =~ /-thread/;
-    ($dll = $define{PERL_DLL}) =~ s/\.dll$//i;
+    (my $dll = $define{PERL_DLL}) =~ s/\.dll$//i;
     $v .= "\@$PATCHLEVEL" if $PATCHLEVEL;
-    $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'";
+    my $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'";
     $d = substr($d, 0, 249) . "...'" if length $d > 253;
     print <<"---EOP---";
 LIBRARY '$dll' INITINSTANCE TERMINSTANCE
@@ -164,9 +203,9 @@ EXPORTS
 ---EOP---
 }
 elsif ($PLATFORM eq 'aix') {
-    $OSVER = `uname -v`;
+    my $OSVER = `uname -v`;
     chop $OSVER;
-    $OSREL = `uname -r`;
+    my $OSREL = `uname -r`;
     chop $OSREL;
     if ($OSVER > 4 || ($OSVER == 4 && $OSREL >= 3)) {
        print "#! ..\n";
@@ -220,7 +259,6 @@ if ($PLATFORM eq 'win32') {
                     PL_linestart
                     PL_modcount
                     PL_pending_ident
-                    PL_sortcxix
                     PL_sublex_info
                     PL_timesbuf
                     main
@@ -258,6 +296,7 @@ if ($PLATFORM eq 'win32') {
                     Perl_getenv_len
                     Perl_my_pclose
                     Perl_my_popen
+                    Perl_my_sprintf
                     )];
 }
 else {
@@ -278,7 +317,6 @@ if ($PLATFORM eq 'wince') {
                     PL_linestart
                     PL_modcount
                     PL_pending_ident
-                    PL_sortcxix
                     PL_sublex_info
                     PL_timesbuf
                     PL_collation_ix
@@ -295,7 +333,6 @@ if ($PLATFORM eq 'wince') {
                     Perl_sv_collxfrm
                     setgid
                     setuid
-                    win32_async_check
                     win32_free_childdir
                     win32_free_childenv
                     win32_get_childdir
@@ -336,6 +373,7 @@ if ($PLATFORM eq 'wince') {
                     Perl_getenv_len
                     Perl_my_pclose
                     Perl_my_popen
+                    Perl_my_sprintf
                     )];
 }
 elsif ($PLATFORM eq 'aix') {
@@ -360,6 +398,7 @@ elsif ($PLATFORM eq 'aix') {
                     Perl_sys_intern_clear
                     Perl_sys_intern_dup
                     Perl_sys_intern_init
+                    Perl_my_sprintf
                     PL_cryptseen
                     PL_opsave
                     PL_statusvalue_vms
@@ -378,6 +417,8 @@ elsif ($PLATFORM eq 'os2') {
                    dlsym
                    dlerror
                    dlclose
+                   dup2
+                   dup
                    my_tmpfile
                    my_tmpnam
                    my_flock
@@ -388,6 +429,8 @@ elsif ($PLATFORM eq 'os2') {
                    my_getpwent
                    my_setpwent
                    my_endpwent
+                   fork_with_resources
+                   croak_with_os2error
                    setgrent
                    endgrent
                    getgrent
@@ -397,6 +440,10 @@ elsif ($PLATFORM eq 'os2') {
                    nthreads_cond
                    os2_cond_wait
                    os2_stat
+                   os2_execname
+                   async_mssleep
+                   msCounter
+                   InfoTable
                    pthread_join
                    pthread_create
                    pthread_detach
@@ -472,7 +519,6 @@ elsif ($PLATFORM eq 'netware') {
                        PL_linestart
                        PL_modcount
                        PL_pending_ident
-                       PL_sortcxix
                        PL_sublex_info
                        PL_timesbuf
                        main
@@ -546,10 +592,19 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debprofdump
                    Perl_debstack
                    Perl_debstackptrs
+                   Perl_pad_sv
                    Perl_sv_peek
+                   Perl_hv_assert
                    PL_block_type
                    PL_watchaddr
                    PL_watchok
+                   PL_watch_pvx
+                   )];
+}
+
+if ($define{'PERL_IMPLICIT_CONTEXT'}) {
+    skip_symbols [qw(
+                   PL_sig_sv
                    )];
 }
 
@@ -574,21 +629,12 @@ else {
                    )];
 }
 
-unless ($define{'PERL_COPY_ON_WRITE'}) {
+unless ($define{'PERL_OLD_COPY_ON_WRITE'}) {
     skip_symbols [qw(
                    Perl_sv_setsv_cow
-                   Perl_sv_release_IVX
                  )];
 }
 
-unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
-    skip_symbols [qw(
-                   PL_protect
-                   Perl_default_protect
-                   Perl_vdefault_protect
-                   )];
-}
-
 unless ($define{'USE_REENTRANT_API'}) {
     skip_symbols [qw(
                    PL_reentrant_buffer
@@ -601,6 +647,8 @@ if ($define{'MYMALLOC'}) {
                    Perl_get_mstats
                    Perl_strdup
                    Perl_putenv
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
                    )];
     if ($define{'USE_ITHREADS'}) {
        emit_symbols [qw(
@@ -619,9 +667,17 @@ else {
                    Perl_dump_mstats
                    Perl_get_mstats
                    Perl_malloced_size
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
                    )];
 }
 
+if ($define{'PERL_USE_SAFE_PUTENV'}) {
+    skip_symbols [qw(
+                   PL_use_safe_putenv
+                  )];
+}
+
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_thr_key
@@ -658,13 +714,16 @@ unless ($define{'USE_ITHREADS'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
-                   PL_ptr_table
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
                    PL_sharedsv_space
                    PL_sharedsv_space_mutex
                    PL_dollarzero_mutex
+                   PL_hints_mutex
+                   PL_perlio_mutex
+                   PL_regdupe
+                   Perl_parser_dup
                    Perl_dirp_dup
                    Perl_cx_dup
                    Perl_si_dup
@@ -674,17 +733,12 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_gp_dup
                    Perl_he_dup
                    Perl_mg_dup
+                   Perl_mro_meta_dup
                    Perl_re_dup
                    Perl_sv_dup
+                   Perl_rvpv_dup
+                   Perl_hek_dup
                    Perl_sys_intern_dup
-                   Perl_ptr_table_clear
-                   Perl_ptr_table_fetch
-                   Perl_ptr_table_free
-                   Perl_ptr_table_new
-                   Perl_ptr_table_clear
-                   Perl_ptr_table_free
-                   Perl_ptr_table_split
-                   Perl_ptr_table_store
                    perl_clone
                    perl_clone_using
                    Perl_sharedsv_find
@@ -694,11 +748,19 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_sharedsv_thrcnt_dec
                    Perl_sharedsv_thrcnt_inc
                    Perl_sharedsv_unlock
+                   Perl_stashpv_hvname_match
+                   Perl_regdupe_internal
+                   Perl_newPADOP
                    )];
 }
 
 unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
     skip_symbols [qw(
+                   PL_my_ctx_mutex
+                   PL_my_cxt_index
+                   PL_my_cxt_list
+                   PL_my_cxt_size
+                   PL_my_cxt_keys
                    Perl_croak_nocontext
                    Perl_die_nocontext
                    Perl_deb_nocontext
@@ -712,6 +774,8 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                    Perl_sv_setpvf_nocontext
                    Perl_sv_catpvf_mg_nocontext
                    Perl_sv_setpvf_mg_nocontext
+                   Perl_my_cxt_init
+                   Perl_my_cxt_index
                    )];
 }
 
@@ -731,13 +795,128 @@ unless ($define{'PL_OP_SLAB_ALLOC'}) {
                      PL_OpPtr
                      PL_OpSlab
                      PL_OpSpace
+                    Perl_Slab_Alloc
+                    Perl_Slab_Free
                     )];
 }
 
+unless ($define{'PERL_DEBUG_READONLY_OPS'}) {
+    skip_symbols [qw(
+                   PL_slab_count
+                   PL_slabs
+                  )];
+}
+
 unless ($define{'THREADS_HAVE_PIDS'}) {
     skip_symbols [qw(PL_ppid)];
 }
 
+unless ($define{'PERL_NEED_APPCTX'}) {
+    skip_symbols [qw(
+                   PL_appctx
+                   )];
+}
+
+unless ($define{'PERL_NEED_TIMESBASE'}) {
+    skip_symbols [qw(
+                   PL_timesbase
+                   )];
+}
+
+unless ($define{'DEBUG_LEAKING_SCALARS_FORK_DUMP'}) {
+    skip_symbols [qw(
+                   PL_dumper_fd
+                   )];
+}
+unless ($define{'PERL_DONT_CREATE_GVSV'}) {
+    skip_symbols [qw(
+                    Perl_gv_SVadd
+                   )];
+}
+if ($define{'SPRINTF_RETURNS_STRLEN'}) {
+    skip_symbols [qw(
+                    Perl_my_sprintf
+                   )];
+}
+unless ($define{'PERL_USES_PL_PIDSTATUS'}) {
+    skip_symbols [qw(
+                    Perl_pidgone
+                    PL_pidstatus
+                   )];
+}
+
+unless ($define{'PERL_TRACK_MEMPOOL'}) {
+    skip_symbols [qw(
+                     PL_memory_debug_header
+                    )];
+}
+
+if ($define{'PERL_MAD'}) {
+    skip_symbols [qw(
+                    PL_nextval
+                    PL_nexttype
+                    )];
+} else {
+    skip_symbols [qw(
+                   PL_madskills
+                   PL_xmlfp
+                   PL_lasttoke
+                   PL_realtokenstart
+                   PL_faketokens
+                   PL_thismad
+                   PL_thistoken
+                   PL_thisopen
+                   PL_thisstuff
+                   PL_thisclose
+                   PL_thiswhite
+                   PL_nextwhite
+                   PL_skipwhite
+                   PL_endwhite
+                   PL_curforce
+                   Perl_pad_peg
+                   Perl_xmldump_indent
+                   Perl_xmldump_vindent
+                   Perl_xmldump_all
+                   Perl_xmldump_packsubs
+                   Perl_xmldump_sub
+                   Perl_xmldump_form
+                   Perl_xmldump_eval
+                   Perl_sv_catxmlsv
+                   Perl_sv_catxmlpvn
+                   Perl_sv_xmlpeek
+                   Perl_do_pmop_xmldump
+                   Perl_pmop_xmldump
+                   Perl_do_op_xmldump
+                   Perl_op_xmldump
+                   )];
+}
+
+unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) {
+    skip_symbols [qw(
+                   PL_my_cxt_keys
+                   Perl_my_cxt_index
+                   )];
+}
+
+unless ($define{'d_mmap'}) {
+    skip_symbols [qw(
+                   PL_mmap_page_size
+                   )];
+}
+
+if ($define{'d_sigaction'}) {
+    skip_symbols [qw(
+                   PL_sig_trapped
+                   )];
+}
+
+if ($^O ne 'vms') {
+    # VMS does its own thing for these symbols.
+    skip_symbols [qw(PL_sig_handlers_initted
+                     PL_sig_ignoring
+                     PL_sig_defaulting)];
+}  
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };
@@ -745,8 +924,9 @@ sub readvar {
     my @syms;
     while (<VARS>) {
        # All symbols have a Perl_ prefix because that's what embed.h
-       # sticks in front of them.
-       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?C?)\(([IGT])(\w+)/);
+       # sticks in front of them.  The A?I?S?C? is strictly speaking
+       # wrong.
+       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/);
     }
     close(VARS);
     return \@syms;
@@ -757,6 +937,8 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
     skip_symbols $global;
     emit_symbol('Perl_GetVars');
     emit_symbols [qw(PL_Vars PL_VarsPtr)] unless $CCTYPE eq 'GCC';
+} else {
+    skip_symbols [qw(Perl_init_global_struct Perl_free_global_struct)];
 }
 
 # functions from *.sym files
@@ -767,75 +949,76 @@ my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 # These are in _addition to_ the public face of the abstraction
 # and need to be exported to allow XS modules to implement layers
 my @layer_syms = qw(
-                        PerlIOBase_clearerr
-                        PerlIOBase_close
-                        PerlIOBase_dup
-                        PerlIOBase_eof
-                        PerlIOBase_error
-                        PerlIOBase_fileno
-                        PerlIOBase_pushed
-                        PerlIOBase_binmode
-                        PerlIOBase_popped
-                        PerlIOBase_read
-                        PerlIOBase_setlinebuf
-                        PerlIOBase_unread
-                        PerlIOBase_noop_ok
-                        PerlIOBase_noop_fail
-                        PerlIOBuf_bufsiz
-                        PerlIOBuf_fill
-                        PerlIOBuf_flush
-                        PerlIOBuf_get_base
-                        PerlIOBuf_get_cnt
-                        PerlIOBuf_get_ptr
-                        PerlIOBuf_open
-                        PerlIOBuf_pushed
-                        PerlIOBuf_popped
-                        PerlIOBuf_read
-                        PerlIOBuf_seek
-                        PerlIOBuf_set_ptrcnt
-                        PerlIOBuf_tell
-                        PerlIOBuf_unread
-                        PerlIOBuf_write
-                        PerlIO_debug
-                        PerlIO_allocate
-                        PerlIO_apply_layera
-                        PerlIO_apply_layers
-                        PerlIO_arg_fetch
-                        PerlIO_define_layer
-                        PerlIO_modestr
-                        PerlIO_parse_layers
-                        PerlIO_layer_fetch
-                        PerlIO_list_free
-                        PerlIO_apply_layera
-                        PerlIO_pending
-                        PerlIO_push
-                        PerlIO_pop
-                        PerlIO_sv_dup
-                        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
-
+                   PerlIOBase_binmode
+                   PerlIOBase_clearerr
+                   PerlIOBase_close
+                   PerlIOBase_dup
+                   PerlIOBase_eof
+                   PerlIOBase_error
+                   PerlIOBase_fileno
+                   PerlIOBase_noop_fail
+                   PerlIOBase_noop_ok
+                   PerlIOBase_popped
+                   PerlIOBase_pushed
+                   PerlIOBase_read
+                   PerlIOBase_setlinebuf
+                   PerlIOBase_unread
+                   PerlIOBuf_bufsiz
+                   PerlIOBuf_close
+                   PerlIOBuf_dup
+                   PerlIOBuf_fill
+                   PerlIOBuf_flush
+                   PerlIOBuf_get_base
+                   PerlIOBuf_get_cnt
+                   PerlIOBuf_get_ptr
+                   PerlIOBuf_open
+                   PerlIOBuf_popped
+                   PerlIOBuf_pushed
+                   PerlIOBuf_read
+                   PerlIOBuf_seek
+                   PerlIOBuf_set_ptrcnt
+                   PerlIOBuf_tell
+                   PerlIOBuf_unread
+                   PerlIOBuf_write
+                   PerlIO_allocate
+                   PerlIO_apply_layera
+                   PerlIO_apply_layers
+                   PerlIO_arg_fetch
+                   PerlIO_debug
+                   PerlIO_define_layer
+                   PerlIO_isutf8
+                   PerlIO_layer_fetch
+                   PerlIO_list_free
+                   PerlIO_modestr
+                   PerlIO_parse_layers
+                   PerlIO_pending
+                   PerlIO_perlio
+                   PerlIO_pop
+                   PerlIO_push
+                   PerlIO_sv_dup
+                   Perl_PerlIO_clearerr
+                   Perl_PerlIO_close
+                   Perl_PerlIO_context_layers
+                   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
 );
 if ($PLATFORM eq 'netware') {
     push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio');
@@ -850,6 +1033,7 @@ if ($define{'USE_PERLIO'}) {
     if ($define{'USE_SFIO'}) {
        # Old legacy non-stdio "PerlIO"
        skip_symbols \@layer_syms;
+       skip_symbols [qw(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
@@ -927,13 +1111,32 @@ if ($define{'USE_PERLIO'}) {
     else {
        # PerlIO with layers - export implementation
        emit_symbols \@layer_syms;
+       emit_symbols [qw(perlsio_binmode)];
+    }
+    if ($define{'USE_ITHREADS'}) {
+       emit_symbols [qw(
+                       PL_perlio_mutex
+                       )];
+    }
+    else {
+       skip_symbols [qw(
+                       PL_perlio_mutex
+                       )];
     }
 } else {
        # -Uuseperlio
        # Skip the PerlIO layer symbols - although
-       # nothing should have exported them any way
+       # nothing should have exported them anyway.
        skip_symbols \@layer_syms;
-        skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
+       skip_symbols [qw(
+                       perlsio_binmode
+                       PL_def_layerlist
+                       PL_known_layers
+                       PL_perlio
+                       PL_perlio_debug_fd
+                       PL_perlio_fd_refcnt
+                       PL_perlio_fd_refcnt_size
+                       )];
 
        # Also do NOT add abstraction symbols from $perlio_sym
        # abstraction is done as #define to stdio
@@ -958,7 +1161,7 @@ for my $syms (@syms) {
 # variables
 
 if ($define{'MULTIPLICITY'}) {
-    for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) {
+    for my $f ($perlvars_h, $intrpvar_h) {
        my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
        emit_symbols $glob;
     }
@@ -977,10 +1180,6 @@ else {
        my $glob = readvar($intrpvar_h);
        emit_symbols $glob;
     }
-    unless ($define{'MULTIPLICITY'}) {
-       my $glob = readvar($thrdvar_h);
-       emit_symbols $glob;
-    }
 }
 
 sub try_symbol {
@@ -1006,6 +1205,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            Perl_init_os_extras
                            Perl_thread_create
                            Perl_win32_init
+                           Perl_win32_term
                            RunPerl
                            win32_async_check
                            win32_errno
@@ -1018,6 +1218,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_pclose
                            win32_rename
                            win32_setmode
+                           win32_chsize
                            win32_lseek
                            win32_tell
                            win32_dup
@@ -1108,6 +1309,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_rewinddir
                            win32_closedir
                            win32_longpath
+                           win32_ansipath
                            win32_os_id
                            win32_getpid
                            win32_crypt
@@ -1161,8 +1363,12 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
     {
        try_symbol($symbol);
     }
+    if ($CCTYPE eq "BORLAND") {
+       try_symbol('_matherr');
+    }
 }
 elsif ($PLATFORM eq 'os2') {
+    my (%mapped, @missing);
     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';
@@ -1324,6 +1530,17 @@ foreach my $symbol (qw(
     }
 }
 
+# records of type boot_module for statically linked modules (except Dynaloader)
+$static_ext =~ s/\//__/g;
+$static_ext =~ s/\bDynaLoader\b//;
+my @stat_mods = map {"boot_$_"} grep {/\S/} split /\s+/, $static_ext;
+foreach my $symbol (@stat_mods)
+    {
+       try_symbol($symbol);
+    }
+
+try_symbol("init_Win32CORE") if $static_ext =~ /\bWin32CORE\b/;
+
 # Now all symbols should be defined because
 # next we are going to output them.
 
@@ -1332,7 +1549,14 @@ foreach my $symbol (sort keys %export) {
 }
 
 if ($PLATFORM eq 'os2') {
-       print "; LAST_ORDINAL=$sym_ord\n";
+       print <<EOP;
+    dll_perlmain=main
+    fill_extLibpath
+    dir_subst
+    Perl_OS2_handler_install
+
+; LAST_ORDINAL=$sym_ord
+EOP
 }
 
 sub emit_symbol {
@@ -1386,17 +1610,6 @@ sub output_symbol {
 
 1;
 __DATA__
-# extra globals not included above.
-Perl_cxinc
-perl_alloc
-perl_alloc_using
-perl_clone
-perl_clone_using
-perl_construct
-perl_destruct
-perl_free
-perl_parse
-perl_run
 # Oddities from PerlIO
 PerlIO_binmode
 PerlIO_getpos
@@ -1406,4 +1619,3 @@ PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
 PerlIO_vsprintf
-perlsio_binmode