This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Fix last remaining Win32 linker error following change 24271
[perl5.git] / makedef.pl
index f5325e8..107541c 100644 (file)
@@ -6,29 +6,46 @@
 # and by MacOS Classic.
 #
 # reads global.sym, pp.sym, perlvars.h, intrpvar.h, thrdvar.h, config.h
-# On OS/2 reads miniperl.map as well
+# On OS/2 reads miniperl.map and the previous version of perl5.def as well
 
 my $PLATFORM;
 my $CCTYPE;
 
 while (@ARGV) {
     my $flag = shift;
+    if ($flag =~ s/^CC_FLAGS=/ /) {
+       for my $fflag ($flag =~ /(?:^|\s)-D(\S+)/g) {
+           $fflag     .= '=1' unless $fflag =~ /^(\w+)=/;
+           $define{$1} = $2   if $fflag =~ /^(\w+)=(.+)$/;
+       }
+       next;
+    }
     $define{$1} = 1 if ($flag =~ /^-D(\w+)$/);
     $define{$1} = $2 if ($flag =~ /^-D(\w+)=(.+)$/);
     $CCTYPE   = $1 if ($flag =~ /^CCTYPE=(\w+)$/);
     $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/);
-       if ($PLATFORM eq 'netware') {
-               $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/);
-       }
+    if ($PLATFORM eq 'netware') {
+       $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/);
+    }
 }
 
-my @PLATFORM = qw(aix win32 os2 MacOS netware);
+my @PLATFORM = qw(aix win32 wince os2 MacOS netware);
 my %PLATFORM;
 @PLATFORM{@PLATFORM} = ();
 
 defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n";
 exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
 
+my %exportperlmalloc =
+    (
+       Perl_malloc             =>      "malloc",
+       Perl_mfree              =>      "free",
+       Perl_realloc            =>      "realloc",
+       Perl_calloc             =>      "calloc",
+    );
+
+my $exportperlmalloc = $PLATFORM eq 'os2';
+
 my $config_sh   = "config.sh";
 my $config_h    = "config.h";
 my $thrdvar_h   = "thrdvar.h";
@@ -38,11 +55,12 @@ 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 eq 'win32' || $PLATFORM eq 'netware') {
+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) {
@@ -56,7 +74,7 @@ elsif ($PLATFORM eq 'MacOS') {
     }
 }
 
-unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware') {
+unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware') {
     open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
     while (<CFG>) {
        if (/^(?:ccflags|optimize)='(.+)'$/) {
@@ -71,6 +89,13 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware')
     }
     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>) {
@@ -95,7 +120,6 @@ if ($define{USE_ITHREADS}) {
 
 $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_ITHREADS} ||
-    $define{USE_5005THREADS}  ||
     $define{MULTIPLICITY} ;
 
 if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
@@ -106,14 +130,17 @@ if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
 
 my $sym_ord = 0;
 
-if ($PLATFORM eq 'win32') {
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
     warn join(' ',keys %define)."\n";
-    print "LIBRARY perl58\n";
+    ($dll = ($define{PERL_DLL} || "perl59")) =~ s/\.dll$//i;
+    print "LIBRARY $dll\n";
     print "DESCRIPTION 'Perl interpreter'\n";
     print "EXPORTS\n";
     if ($define{PERL_IMPLICIT_SYS}) {
        output_symbol("perl_get_host_info");
        output_symbol("perl_alloc_override");
+    }
+    if ($define{USE_ITHREADS} and $define{PERL_IMPLICIT_SYS}) {
        output_symbol("perl_clone_host");
     }
 }
@@ -123,7 +150,7 @@ elsif ($PLATFORM eq 'os2') {
        last if /^\s*EXPORTS\b/;
       }
       while (<$fh>) {
-       $ordinal{$1} = $2 if /^\s*"(\w+)"\s*\@(\d+)\s*$/;
+       $ordinal{$1} = $2 if /^\s*"(\w+)"\s*(?:=\s*"\w+"\s*)?\@(\d+)\s*$/;
        # This allows skipping ordinals which were used in older versions
        $sym_ord = $1 if /^\s*;\s*LAST_ORDINAL\s*=\s*(\d+)\s*$/;
       }
@@ -157,7 +184,7 @@ elsif ($PLATFORM eq 'aix') {
 }
 elsif ($PLATFORM eq 'netware') {
        if ($FILETYPE eq 'def') {
-       print "LIBRARY perl58\n";
+       print "LIBRARY perl59\n";
        print "DESCRIPTION 'Perl interpreter for NetWare'\n";
        print "EXPORTS\n";
        }
@@ -206,7 +233,82 @@ if ($PLATFORM eq 'win32') {
                     PL_timesbuf
                     main
                     Perl_ErrorNo
-                    Perl_GetVars
+                    Perl_do_exec3
+                    Perl_do_ipcctl
+                    Perl_do_ipcget
+                    Perl_do_msgrcv
+                    Perl_do_msgsnd
+                    Perl_do_semop
+                    Perl_do_shmio
+                    Perl_dump_fds
+                    Perl_init_thread_intern
+                    Perl_my_bzero
+                    Perl_my_bcopy
+                    Perl_my_htonl
+                    Perl_my_ntohl
+                    Perl_my_swap
+                    Perl_my_chsize
+                    Perl_same_dirent
+                    Perl_setenv_getix
+                    Perl_unlnk
+                    Perl_watch
+                    Perl_safexcalloc
+                    Perl_safexmalloc
+                    Perl_safexfree
+                    Perl_safexrealloc
+                    Perl_my_memcmp
+                    Perl_my_memset
+                    PL_cshlen
+                    PL_cshname
+                    PL_opsave
+                    Perl_do_exec
+                    Perl_getenv_len
+                    Perl_my_pclose
+                    Perl_my_popen
+                    )];
+}
+else {
+    skip_symbols [qw(
+                    Perl_do_spawn
+                    Perl_do_spawn_nowait
+                    Perl_do_aspawn
+                    )];
+}
+if ($PLATFORM eq 'wince') {
+    skip_symbols [qw(
+                    PL_statusvalue_vms
+                    PL_archpat_auto
+                    PL_cryptseen
+                    PL_DBcv
+                    PL_generation
+                    PL_lastgotoprobe
+                    PL_linestart
+                    PL_modcount
+                    PL_pending_ident
+                    PL_sortcxix
+                    PL_sublex_info
+                    PL_timesbuf
+                    PL_collation_ix
+                    PL_collation_name
+                    PL_collation_standard
+                    PL_collxfrm_base
+                    PL_collxfrm_mult
+                    PL_numeric_compat1
+                    PL_numeric_local
+                    PL_numeric_name
+                    PL_numeric_radix_sv
+                    PL_numeric_standard
+                    PL_vtbl_collxfrm
+                    Perl_sv_collxfrm
+                    setgid
+                    setuid
+                    win32_free_childdir
+                    win32_free_childenv
+                    win32_get_childdir
+                    win32_get_childenv
+                    win32_spawnvp
+                    main
+                    Perl_ErrorNo
                     Perl_do_exec3
                     Perl_do_ipcctl
                     Perl_do_ipcget
@@ -245,7 +347,6 @@ elsif ($PLATFORM eq 'aix') {
     skip_symbols([qw(
                     Perl_dump_fds
                     Perl_ErrorNo
-                    Perl_GetVars
                     Perl_my_bcopy
                     Perl_my_bzero
                     Perl_my_chsize
@@ -281,6 +382,8 @@ elsif ($PLATFORM eq 'os2') {
                    dlsym
                    dlerror
                    dlclose
+                   dup2
+                   dup
                    my_tmpfile
                    my_tmpnam
                    my_flock
@@ -291,6 +394,8 @@ elsif ($PLATFORM eq 'os2') {
                    my_getpwent
                    my_setpwent
                    my_endpwent
+                   fork_with_resources
+                   croak_with_os2error
                    setgrent
                    endgrent
                    getgrent
@@ -300,6 +405,10 @@ elsif ($PLATFORM eq 'os2') {
                    nthreads_cond
                    os2_cond_wait
                    os2_stat
+                   os2_execname
+                   async_mssleep
+                   msCounter
+                   InfoTable
                    pthread_join
                    pthread_create
                    pthread_detach
@@ -327,11 +436,17 @@ elsif ($PLATFORM eq 'os2') {
                    os2error
                    ResetWinError
                    CroakWinError
+                   PL_do_undump
                    )]);
+    emit_symbols([qw(os2_cond_wait
+                    pthread_join
+                    pthread_create
+                    pthread_detach
+                   )])
+      if $define{'USE_5005THREADS'} or $define{'USE_ITHREADS'};
 }
 elsif ($PLATFORM eq 'MacOS') {
     skip_symbols [qw(
-                   Perl_GetVars
                    PL_cryptseen
                    PL_cshlen
                    PL_cshname
@@ -373,7 +488,6 @@ elsif ($PLATFORM eq 'netware') {
                        PL_timesbuf
                        main
                        Perl_ErrorNo
-                       Perl_GetVars
                        Perl_do_exec3
                        Perl_do_ipcctl
                        Perl_do_ipcget
@@ -446,6 +560,7 @@ unless ($define{'DEBUGGING'}) {
                    PL_block_type
                    PL_watchaddr
                    PL_watchok
+                   PL_watch_pvx
                    )];
 }
 
@@ -470,12 +585,11 @@ else {
                    )];
 }
 
-unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
+unless ($define{'PERL_COPY_ON_WRITE'}) {
     skip_symbols [qw(
-                   PL_protect
-                   Perl_default_protect
-                   Perl_vdefault_protect
-                   )];
+                   Perl_sv_setsv_cow
+                   Perl_sv_release_IVX
+                 )];
 }
 
 unless ($define{'USE_REENTRANT_API'}) {
@@ -490,8 +604,10 @@ if ($define{'MYMALLOC'}) {
                    Perl_get_mstats
                    Perl_strdup
                    Perl_putenv
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
                    )];
-    if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+    if ($define{'USE_ITHREADS'}) {
        emit_symbols [qw(
                        PL_malloc_mutex
                        )];
@@ -508,16 +624,42 @@ else {
                    Perl_dump_mstats
                    Perl_get_mstats
                    Perl_malloced_size
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
+                   )];
+}
+
+if ($define{'PERL_MALLOC_WRAP'}) {
+    emit_symbols [qw(
+                   PL_memory_wrap
+                   )];
+}
+
+unless ($define{'HAS_MMAP'}) {
+    skip_symbols [qw(
+                   PL_mmap_page_size
                    )];
 }
 
-unless ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+unless ($define{'HAS_TIMES'} || $define{'PERL_NEED_TIMESBASE'}) {
+    skip_symbols [qw(
+                   PL_timesbase
+                   )];
+}
+
+unless ($define{'PERL_NEED_APPCTX'}) {
+    skip_symbols [qw(
+                   PL_appctx
+                   )];
+}
+
+unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_thr_key
                    )];
 }
 
-unless ($define{'USE_5005THREADS'}) {
+# USE_5005THREADS symbols. Kept as reference for easier removal
     skip_symbols [qw(
                    PL_sv_mutex
                    PL_strtab_mutex
@@ -544,7 +686,6 @@ unless ($define{'USE_5005THREADS'}) {
                    Perl_magic_mutexfree
                    Perl_sv_lock
                    )];
-}
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
@@ -554,6 +695,7 @@ unless ($define{'USE_ITHREADS'}) {
                    PL_regex_padav
                    PL_sharedsv_space
                    PL_sharedsv_space_mutex
+                   PL_dollarzero_mutex
                    Perl_dirp_dup
                    Perl_cx_dup
                    Perl_si_dup
@@ -565,6 +707,7 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_mg_dup
                    Perl_re_dup
                    Perl_sv_dup
+                   Perl_rvpv_dup
                    Perl_sys_intern_dup
                    Perl_ptr_table_clear
                    Perl_ptr_table_fetch
@@ -604,6 +747,12 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                    )];
 }
 
+if ($define{'PERL_IMPLICIT_CONTEXT'}) {
+    skip_symbols [qw(
+                   PL_sig_sv
+                   )];
+}
+
 unless ($define{'PERL_IMPLICIT_SYS'}) {
     skip_symbols [qw(
                    perl_alloc_using
@@ -615,14 +764,40 @@ unless ($define{'FAKE_THREADS'}) {
     skip_symbols [qw(PL_curthr)];
 }
 
+unless ($define{'FAKE_DEFAULT_SIGNAL_HANDLERS'}) {
+    skip_symbols [qw(
+                   PL_sig_defaulting
+                   )];
+}
+
+unless ($define{'FAKE_PERSISTENT_SIGNAL_HANDLERS'}) {
+    skip_symbols [qw(
+                   PL_sig_ignoring
+                   )];
+}
+
+unless ($define{'FAKE_DEFAULT_SIGNAL_HANDLERS'} ||
+        $define{'FAKE_PERSISTENT_SIGNAL_HANDLERS'})
+{
+    skip_symbols [qw(
+                   PL_sig_handlers_initted
+                   )];
+}
+
 unless ($define{'PL_OP_SLAB_ALLOC'}) {
     skip_symbols [qw(
                      PL_OpPtr
                      PL_OpSlab
                      PL_OpSpace
+                    Perl_Slab_Alloc
+                    Perl_Slab_Free
                     )];
 }
 
+unless ($define{'THREADS_HAVE_PIDS'}) {
+    skip_symbols [qw(PL_ppid)];
+}
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };
@@ -631,15 +806,18 @@ sub readvar {
     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+)/);
+       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/);
     }
     close(VARS);
     return \@syms;
 }
 
-if ($define{'USE_5005THREADS'}) {
-    my $thrd = readvar($thrdvar_h);
-    skip_symbols $thrd;
+unless ($define{'PERL_GLOBAL_STRUCT'}) {
+    skip_symbols [qw(
+                    Perl_GetVars
+                    Perl_free_global_struct
+                    Perl_init_global_struct
+                    )];
 }
 
 if ($define{'PERL_GLOBAL_STRUCT'}) {
@@ -657,70 +835,79 @@ 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_read
-                        PerlIOBase_setlinebuf
-                        PerlIOBase_unread
-                        PerlIOBuf_bufsiz
-                        PerlIOBuf_fill
-                        PerlIOBuf_flush
-                        PerlIOBuf_get_cnt
-                        PerlIOBuf_get_ptr
-                        PerlIOBuf_open
-                        PerlIOBuf_pushed
-                        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_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_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');
+}
 
 if ($define{'USE_PERLIO'}) {
     # Export the symols that make up the PerlIO abstraction, regardless
@@ -800,6 +987,9 @@ if ($define{'USE_PERLIO'}) {
                         Perl_PerlIO_tell
                         Perl_PerlIO_unread
                         Perl_PerlIO_write
+                         PL_def_layerlist
+                         PL_known_layers
+                         PL_perlio
                         )];
     }
     else {
@@ -841,7 +1031,7 @@ if ($define{'MULTIPLICITY'}) {
        emit_symbols $glob;
     }
     # XXX AIX seems to want the perlvars.h symbols, for some reason
-    if ($PLATFORM eq 'aix') {
+    if ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') {    # OS/2 needs PL_thr_key
        my $glob = readvar($perlvars_h);
        emit_symbols $glob;
     }
@@ -855,7 +1045,7 @@ else {
        my $glob = readvar($intrpvar_h);
        emit_symbols $glob;
     }
-    unless ($define{'MULTIPLICITY'} || $define{'USE_5005THREADS'}) {
+    unless ($define{'MULTIPLICITY'}) {
        my $glob = readvar($thrdvar_h);
        emit_symbols $glob;
     }
@@ -876,7 +1066,7 @@ while (<DATA>) {
     try_symbol($_);
 }
 
-if ($PLATFORM eq 'win32') {
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
     foreach my $symbol (qw(
                            setuid
                            setgid
@@ -884,6 +1074,7 @@ if ($PLATFORM eq 'win32') {
                            Perl_init_os_extras
                            Perl_thread_create
                            Perl_win32_init
+                           Perl_win32_term
                            RunPerl
                            win32_async_check
                            win32_errno
@@ -896,6 +1087,7 @@ if ($PLATFORM eq 'win32') {
                            win32_pclose
                            win32_rename
                            win32_setmode
+                           win32_chsize
                            win32_lseek
                            win32_tell
                            win32_dup
@@ -973,6 +1165,7 @@ if ($PLATFORM eq 'win32') {
                            win32_link
                            win32_unlink
                            win32_utime
+                           win32_gettimeofday
                            win32_uname
                            win32_wait
                            win32_waitpid
@@ -1046,6 +1239,7 @@ elsif ($PLATFORM eq 'os2') {
 
     @missing = grep { !exists $mapped{$_} }
                    keys %export;
+    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
     delete $export{$_} foreach @missing;
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -1192,12 +1386,23 @@ foreach my $symbol (qw(
                        Perl_sv_catsv
                        Perl_sv_catpvn
                        Perl_sv_2pv
+                       nw_freeenviron
+                       Remove_Thread_Ctx
                           ))
     {
        try_symbol($symbol);
     }
 }
 
+# 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);
+    }
+
 # Now all symbols should be defined because
 # next we are going to output them.
 
@@ -1206,7 +1411,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 {
@@ -1217,7 +1429,7 @@ sub emit_symbol {
 
 sub output_symbol {
     my $symbol = shift;
-    if ($PLATFORM eq 'win32') {
+    if ($PLATFORM =~ /^win(?:32|ce)$/) {
        $symbol = "_$symbol" if $CCTYPE eq 'BORLAND';
        print "\t$symbol\n";
 # XXX: binary compatibility between compilers is an exercise
@@ -1245,6 +1457,10 @@ sub output_symbol {
     elsif ($PLATFORM eq 'os2') {
        printf qq(    %-31s \@%s\n),
          qq("$symbol"), $ordinal{$symbol} || ++$sym_ord;
+       printf qq(    %-31s \@%s\n),
+         qq("$exportperlmalloc{$symbol}" = "$symbol"),
+         $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord
+         if $exportperlmalloc and exists $exportperlmalloc{$symbol};
     }
     elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
        print "$symbol\n";
@@ -1267,7 +1483,7 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
-# Oddities from PerlIO 
+# Oddities from PerlIO
 PerlIO_binmode
 PerlIO_getpos
 PerlIO_init