This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Add my_sprintf, which is usually just a macro for sprintf, for those
[perl5.git] / makedef.pl
index 1d35103..8975d50 100644 (file)
@@ -6,13 +6,20 @@
 # 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+)$/);
@@ -29,6 +36,34 @@ 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 "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 $config = `$^X -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",
+       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,6 +73,7 @@ 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.
@@ -45,13 +81,13 @@ if ($PLATFORM eq 'aix') {
 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) {
+            $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) {
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!::!;
     }
 }
@@ -63,6 +99,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='(.+)'$/;
@@ -71,6 +110,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>) {
@@ -95,7 +141,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,9 +151,10 @@ 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} || "perl58")) =~ s/\.dll$//i;
+    ($dll = ($define{PERL_DLL} || "perl59")) =~ s/\.dll$//i;
     print "LIBRARY $dll\n";
     print "DESCRIPTION 'Perl interpreter'\n";
     print "EXPORTS\n";
@@ -126,7 +172,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*$/;
       }
@@ -160,7 +206,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";
        }
@@ -244,7 +290,14 @@ if ($PLATFORM eq 'win32') {
                     Perl_my_popen
                     )];
 }
-elsif ($PLATFORM eq 'wince') {
+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
@@ -272,7 +325,6 @@ elsif ($PLATFORM eq 'wince') {
                     Perl_sv_collxfrm
                     setgid
                     setuid
-                    win32_async_check
                     win32_free_childdir
                     win32_free_childenv
                     win32_get_childdir
@@ -355,6 +407,8 @@ elsif ($PLATFORM eq 'os2') {
                    dlsym
                    dlerror
                    dlclose
+                   dup2
+                   dup
                    my_tmpfile
                    my_tmpnam
                    my_flock
@@ -365,6 +419,8 @@ elsif ($PLATFORM eq 'os2') {
                    my_getpwent
                    my_setpwent
                    my_endpwent
+                   fork_with_resources
+                   croak_with_os2error
                    setgrent
                    endgrent
                    getgrent
@@ -374,6 +430,10 @@ elsif ($PLATFORM eq 'os2') {
                    nthreads_cond
                    os2_cond_wait
                    os2_stat
+                   os2_execname
+                   async_mssleep
+                   msCounter
+                   InfoTable
                    pthread_join
                    pthread_create
                    pthread_detach
@@ -401,7 +461,14 @@ 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(
@@ -520,6 +587,13 @@ unless ($define{'DEBUGGING'}) {
                    PL_block_type
                    PL_watchaddr
                    PL_watchok
+                   PL_watch_pvx
+                   )];
+}
+
+if ($define{'PERL_IMPLICIT_CONTEXT'}) {
+    skip_symbols [qw(
+                   PL_sig_sv
                    )];
 }
 
@@ -544,12 +618,11 @@ else {
                    )];
 }
 
-unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
+unless ($define{'PERL_OLD_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'}) {
@@ -564,8 +637,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
                        )];
@@ -582,16 +657,30 @@ else {
                    Perl_dump_mstats
                    Perl_get_mstats
                    Perl_malloced_size
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
                    )];
 }
 
-unless ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+unless ($define{'PERL_MALLOC_WRAP'}) {
+    skip_symbols [qw(
+                   PL_memory_wrap
+                   )];
+}
+
+if ($define{'PERL_USE_SAFE_PUTENV'}) {
+    skip_symbols [qw(
+                   PL_use_safe_putenv
+                  )];
+}
+
+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
@@ -618,16 +707,18 @@ unless ($define{'USE_5005THREADS'}) {
                    Perl_magic_mutexfree
                    Perl_sv_lock
                    )];
-}
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_ptr_table
+                   PL_pte_root
+                   PL_pte_arenaroot
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
                    PL_sharedsv_space
                    PL_sharedsv_space_mutex
+                   PL_dollarzero_mutex
                    Perl_dirp_dup
                    Perl_cx_dup
                    Perl_si_dup
@@ -639,6 +730,8 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_mg_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
@@ -657,6 +750,7 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_sharedsv_thrcnt_dec
                    Perl_sharedsv_thrcnt_inc
                    Perl_sharedsv_unlock
+                   Perl_stashpv_hvname_match
                    )];
 }
 
@@ -694,9 +788,62 @@ unless ($define{'PL_OP_SLAB_ALLOC'}) {
                      PL_OpPtr
                      PL_OpSlab
                      PL_OpSpace
+                    Perl_Slab_Alloc
+                    Perl_Slab_Free
                     )];
 }
 
+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{'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]" };
@@ -704,23 +851,21 @@ 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;
 }
 
-if ($define{'USE_5005THREADS'}) {
-    my $thrd = readvar($thrdvar_h);
-    skip_symbols $thrd;
-}
-
 if ($define{'PERL_GLOBAL_STRUCT'}) {
     my $global = readvar($perlvars_h);
     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
@@ -731,69 +876,75 @@ 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_base
-                        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');
@@ -808,6 +959,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
@@ -885,12 +1037,14 @@ if ($define{'USE_PERLIO'}) {
     else {
        # PerlIO with layers - export implementation
        emit_symbols \@layer_syms;
+       emit_symbols [qw(perlsio_binmode)];
     }
 } 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(perlsio_binmode)];
         skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
 
        # Also do NOT add abstraction symbols from $perlio_sym
@@ -921,7 +1075,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;
     }
@@ -935,7 +1089,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;
     }
@@ -964,6 +1118,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
@@ -976,6 +1131,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_pclose
                            win32_rename
                            win32_setmode
+                           win32_chsize
                            win32_lseek
                            win32_tell
                            win32_dup
@@ -1119,6 +1275,9 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
     {
        try_symbol($symbol);
     }
+    if ($CCTYPE eq "BORLAND") {
+       try_symbol('_matherr');
+    }
 }
 elsif ($PLATFORM eq 'os2') {
     open MAP, 'miniperl.map' or die 'Cannot read miniperl.map';
@@ -1127,6 +1286,7 @@ elsif ($PLATFORM eq 'os2') {
 
     @missing = grep { !exists $mapped{$_} }
                    keys %export;
+    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
     delete $export{$_} foreach @missing;
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -1273,12 +1433,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.
 
@@ -1287,7 +1458,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 {
@@ -1326,6 +1504,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";
@@ -1348,7 +1530,7 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
-# Oddities from PerlIO 
+# Oddities from PerlIO
 PerlIO_binmode
 PerlIO_getpos
 PerlIO_init
@@ -1357,4 +1539,3 @@ PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
 PerlIO_vsprintf
-perlsio_binmode