This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
remove deprecated PL_timesbuf
[perl5.git] / makedef.pl
index 1827bd2..90c9368 100644 (file)
@@ -3,20 +3,21 @@
 # Create the export list for perl.
 #
 # Needed by WIN32 and OS/2 for creating perl.dll,
-# and by AIX for creating libperl.a when -Dusershrplib is in effect,
+# and by AIX for creating libperl.a when -Duseshrplib is in effect,
 # and by VMS for creating perlshr.exe.
 #
 # Reads from information stored in
 #
+#    %Config::Config (ie config.sh)
 #    config.h
-#    config.sh
-#    global.sym
+#    embed.fnc
 #    globvar.sym
 #    intrpvar.h
 #    miniperl.map (on OS/2)
 #    perl5.def    (on OS/2; this is the old version of the file being made)
 #    perlio.sym
 #    perlvars.h
+#    regen/opcodes
 #
 # plus long lists of function names hard-coded directly in this script.
 #
 #    perl.imp    NetWare
 #    makedef.lis VMS
 
-BEGIN { unshift @INC, "lib" }
-use Config;
-use strict;
+my $fold;
+my %ARGS;
+my %define;
 
-use vars qw($PLATFORM $CCTYPE $FILETYPE $TARG_DIR);
+BEGIN {
+    BEGIN { unshift @INC, "lib" }
+    use Config;
+    use strict;
 
-$CCTYPE = 'MSVC';
-$TARG_DIR = '';
+    %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
 
-my (%define, %ordinal);
+    sub process_cc_flags {
+       foreach (map {split /\s+/, $_} @_) {
+           $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/;
+       }
+    }
 
-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+)=(.+)$/;
+    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;
        }
-       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+)$/);
-    $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/);
-    $TARG_DIR = $1 if $flag =~ /^TARG_DIR=(.+)$/;
+    my @PLATFORM = qw(aix win32 wince os2 netware vms test);
+    my %PLATFORM;
+    @PLATFORM{@PLATFORM} = ();
+
+    die "PLATFORM undefined, must be one of: @PLATFORM\n"
+       unless defined $ARGS{PLATFORM};
+    die "PLATFORM must be one of: @PLATFORM\n"
+       unless exists $PLATFORM{$ARGS{PLATFORM}};
 }
+use constant PLATFORM => $ARGS{PLATFORM};
 
-my @PLATFORM = qw(aix win32 wince os2 netware vms);
-my %PLATFORM;
-@PLATFORM{@PLATFORM} = ();
+require "$ARGS{TARG_DIR}regen/embed_lib.pl";
 
-defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n";
-exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
+# 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';
 
 # 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
@@ -75,9 +87,12 @@ exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
 # the user might have chosen to disable because the canned configs are
 # minimal configs that don't include any of those options.
 
-my @options = sort(Config::bincompat_options(), Config::non_bincompat_options());
-print STDERR "Options: (@options)\n";
-$define{$_} = 1 foreach @options;
+#don't use the host Perl's -V defines for the WinCE Perl
+if($ARGS{PLATFORM} ne 'wince') {
+    my @options = sort(Config::bincompat_options(), Config::non_bincompat_options());
+    print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test';
+    $define{$_} = 1 foreach @options;
+}
 
 my %exportperlmalloc =
     (
@@ -87,58 +102,20 @@ my %exportperlmalloc =
        Perl_calloc             =>      "calloc",
     );
 
-my $exportperlmalloc = $PLATFORM eq 'os2';
-
-my $config_sh   = "config.sh";
-my $config_h    = "config.h";
-my $intrpvar_h  = "intrpvar.h";
-my $perlvars_h  = "perlvars.h";
-my $global_sym  = "global.sym";
-my $globvar_sym = "globvar.sym";
-my $perlio_sym  = "perlio.sym";
-my $static_ext = "";
-
-my %skip;
-# All platforms export boot_DynaLoader unconditionally.
-my %export = ( boot_DynaLoader => 1 );
-
-s/^/$TARG_DIR/ foreach($intrpvar_h, $perlvars_h, $global_sym, $globvar_sym,
-                      $perlio_sym, $config_sh);
-
-unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'netware') {
-    open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
-    while (<CFG>) {
-       if (/^(?:ccflags|optimize)='(.+)'$/) {
-           $_ = $1;
-           $define{$1} = 1 while /-D(\w+)/g;
-       }
-       $define{$1} = $2
-           if /^(config_args|archname|perl_patchlevel)='(.+)'$/;
-    }
-    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);
-}
+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;
 }
 close(CFG);
 
 # perl.h logic duplication begins
 
-if ($define{PERL_IMPLICIT_SYS}) {
-    $define{PL_OP_SLAB_ALLOC} = 1;
-}
-
 if ($define{USE_ITHREADS}) {
     if (!$define{MULTIPLICITY}) {
         $define{MULTIPLICITY} = 1;
@@ -149,27 +126,19 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
     $define{USE_ITHREADS} ||
     $define{MULTIPLICITY} ;
 
-if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
+if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') {
     $define{USE_REENTRANT_API} = 1;
 }
 
 # perl.h logic duplication ends
 
-my $sym_ord = 0;
+print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n"
+     unless $ARGS{PLATFORM} eq 'test';
 
-print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n";
+my $sym_ord = 0;
+my %ordinal;
 
-if ($PLATFORM =~ /^win(?:32|ce)$/) {
-    (my $dll = ($define{PERL_DLL} || "perl515")) =~ s/\.dll$//i;
-    print "LIBRARY $dll\n";
-    # The DESCRIPTION module definition file statement is not supported
-    # by VC7 onwards.
-    if ($CCTYPE =~ /^(?:MSVC60|GCC|BORLAND)$/) {
-       print "DESCRIPTION 'Perl interpreter'\n";
-    }
-    print "EXPORTS\n";
-}
-elsif ($PLATFORM eq 'os2') {
+if ($ARGS{PLATFORM} eq 'os2') {
     if (open my $fh, '<', 'perl5.def') {
       while (<$fh>) {
        last if /^\s*EXPORTS\b/;
@@ -181,52 +150,41 @@ elsif ($PLATFORM eq 'os2') {
       }
       $sym_ord < $_ and $sym_ord = $_ for values %ordinal; # Take the max
     }
-    (my $v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
-    $v .= '-thread' if $define{archname} =~ /-thread/;
-    (my $dll = $define{PERL_DLL}) =~ s/\.dll$//i;
-    $v .= "\@$define{perl_patchlevel}" if $define{perl_patchlevel};
-    my $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $define{config_args}'";
-    $d = substr($d, 0, 249) . "...'" if length $d > 253;
-    print <<"---EOP---";
-LIBRARY '$dll' INITINSTANCE TERMINSTANCE
-$d
-STACKSIZE 32768
-CODE LOADONCALL
-DATA LOADONCALL NONSHARED MULTIPLE
-EXPORTS
----EOP---
-}
-elsif ($PLATFORM eq 'aix') {
-    my $OSVER = `uname -v`;
-    chop $OSVER;
-    my $OSREL = `uname -r`;
-    chop $OSREL;
-    if ($OSVER > 4 || ($OSVER == 4 && $OSREL >= 3)) {
-       print "#! ..\n";
-    } else {
-       print "#!\n";
-    }
-}
-elsif ($PLATFORM eq 'netware') {
-       if ($FILETYPE eq 'def') {
-       print "LIBRARY perl515\n";
-       print "DESCRIPTION 'Perl interpreter for NetWare'\n";
-       print "EXPORTS\n";
-       }
 }
 
+my %skip;
+# All platforms export boot_DynaLoader unconditionally.
+my %export = ( boot_DynaLoader => 1 );
+
 sub try_symbols {
     foreach my $symbol (@_) {
-       my $skipsym = $symbol;
-       # XXX hack
-       if ($define{MULTIPLICITY}) {
-           $skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/;
-       }
-       ++$export{$symbol} unless exists $skip{$skipsym};
+       ++$export{$symbol} unless exists $skip{$symbol};
+    }
+}
+
+sub readvar {
+    # $hash is the hash that we're adding to. For one of our callers, it will
+    # actually be the skip hash but that doesn't affect the intent of what
+    # we're doing, as in that case we skip adding something to the skip hash
+    # for the second time.
+
+    my $file = $ARGS{TARG_DIR} . shift;
+    my $hash = shift;
+    my $proc = shift;
+    open my $vars, '<', $file or die die "Cannot open $file: $!\n";
+
+    while (<$vars>) {
+       # All symbols have a Perl_ prefix because that's what embed.h sticks
+       # in front of them.  The A?I?S?C? is strictly speaking wrong.
+       next unless /\bPERLVAR(A?I?S?C?)\(([IGT]),\s*(\w+)/;
+
+       my $var = "PL_$3";
+       my $symbol = $proc ? &$proc($1,$2,$3) : $var;
+       ++$hash->{$symbol} unless exists $skip{$var};
     }
 }
 
-if ($PLATFORM ne 'os2') {
+if ($ARGS{PLATFORM} ne 'os2') {
     ++$skip{$_} foreach qw(
                     PL_cryptseen
                     PL_opsave
@@ -241,31 +199,33 @@ if ($PLATFORM ne 'os2') {
                     Perl_my_ntohl
                     Perl_my_swap
                         );
-    if ($PLATFORM eq 'vms') {
+    if ($ARGS{PLATFORM} eq 'vms') {
        ++$skip{PL_statusvalue_posix};
+        # This is a wrapper if we have symlink, not a replacement
+        # if we don't.
+        ++$skip{Perl_my_symlink} unless $Config{d_symlink};
     } else {
        ++$skip{PL_statusvalue_vms};
-       if ($PLATFORM ne 'aix') {
+       if ($ARGS{PLATFORM} ne 'aix') {
            ++$skip{$_} foreach qw(
                                PL_DBcv
                                PL_generation
                                PL_lastgotoprobe
                                PL_modcount
-                               PL_timesbuf
                                main
                                 );
        }
     }
 }
 
-if ($PLATFORM ne 'vms') {
+if ($ARGS{PLATFORM} ne 'vms') {
     # VMS does its own thing for these symbols.
     ++$skip{$_} foreach qw(
                        PL_sig_handlers_initted
                        PL_sig_ignoring
                        PL_sig_defaulting
                         );
-    if ($PLATFORM ne 'win32') {
+    if ($ARGS{PLATFORM} ne 'win32') {
        ++$skip{$_} foreach qw(
                            Perl_do_spawn
                            Perl_do_spawn_nowait
@@ -274,166 +234,10 @@ if ($PLATFORM ne 'vms') {
     }
 }
 
-if ($PLATFORM eq 'os2') {
-    try_symbols(qw(
-                   ctermid
-                   get_sysinfo
-                   Perl_OS2_init
-                   Perl_OS2_init3
-                   Perl_OS2_term
-                   OS2_Perl_data
-                   dlopen
-                   dlsym
-                   dlerror
-                   dlclose
-                   dup2
-                   dup
-                   my_tmpfile
-                   my_tmpnam
-                   my_flock
-                   my_rmdir
-                   my_mkdir
-                   my_getpwuid
-                   my_getpwnam
-                   my_getpwent
-                   my_setpwent
-                   my_endpwent
-                   fork_with_resources
-                   croak_with_os2error
-                   setgrent
-                   endgrent
-                   getgrent
-                   malloc_mutex
-                   threads_mutex
-                   nthreads
-                   nthreads_cond
-                   os2_cond_wait
-                   os2_stat
-                   os2_execname
-                   async_mssleep
-                   msCounter
-                   InfoTable
-                   pthread_join
-                   pthread_create
-                   pthread_detach
-                   XS_Cwd_change_drive
-                   XS_Cwd_current_drive
-                   XS_Cwd_extLibpath
-                   XS_Cwd_extLibpath_set
-                   XS_Cwd_sys_abspath
-                   XS_Cwd_sys_chdir
-                   XS_Cwd_sys_cwd
-                   XS_Cwd_sys_is_absolute
-                   XS_Cwd_sys_is_relative
-                   XS_Cwd_sys_is_rooted
-                   XS_DynaLoader_mod2fname
-                   XS_File__Copy_syscopy
-                   Perl_Register_MQ
-                   Perl_Deregister_MQ
-                   Perl_Serve_Messages
-                   Perl_Process_Messages
-                   init_PMWIN_entries
-                   PMWIN_entries
-                   Perl_hab_GET
-                   loadByOrdinal
-                   pExtFCN
-                   os2error
-                   ResetWinError
-                   CroakWinError
-                   PL_do_undump
-                   ));
-    try_symbols(qw(
-                    os2_cond_wait
-                    pthread_join
-                    pthread_create
-                    pthread_detach
-                   ))
-      if $define{'USE_5005THREADS'} or $define{'USE_ITHREADS'};
-}
-elsif ($PLATFORM eq 'vms') {
-    try_symbols(qw(
-                       Perl_cando
-                       Perl_cando_by_name
-                       Perl_closedir
-                       Perl_csighandler_init
-                       Perl_do_rmdir
-                       Perl_fileify_dirspec
-                       Perl_fileify_dirspec_ts
-                       Perl_fileify_dirspec_utf8
-                       Perl_fileify_dirspec_utf8_ts
-                       Perl_flex_fstat
-                       Perl_flex_lstat
-                       Perl_flex_stat
-                       Perl_kill_file
-                       Perl_my_chdir
-                       Perl_my_chmod
-                       Perl_my_crypt
-                       Perl_my_endpwent
-                       Perl_my_fclose
-                       Perl_my_fdopen
-                       Perl_my_fgetname
-                       Perl_my_flush
-                       Perl_my_fwrite
-                       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_localtime
-                       Perl_my_mkdir
-                       Perl_my_sigaction 
-                       Perl_my_symlink
-                       Perl_my_time
-                       Perl_my_tmpfile
-                       Perl_my_trnlnm
-                       Perl_my_utime
-                       Perl_my_waitpid
-                       Perl_opendir
-                       Perl_pathify_dirspec
-                       Perl_pathify_dirspec_ts
-                       Perl_pathify_dirspec_utf8
-                       Perl_pathify_dirspec_utf8_ts
-                       Perl_readdir
-                       Perl_readdir_r
-                       Perl_rename
-                       Perl_rmscopy
-                       Perl_rmsexpand
-                       Perl_rmsexpand_ts
-                       Perl_rmsexpand_utf8
-                       Perl_rmsexpand_utf8_ts
-                       Perl_seekdir
-                       Perl_sig_to_vmscondition
-                       Perl_telldir
-                       Perl_tounixpath
-                       Perl_tounixpath_ts
-                       Perl_tounixpath_utf8
-                       Perl_tounixpath_utf8_ts
-                       Perl_tounixspec
-                       Perl_tounixspec_ts
-                       Perl_tounixspec_utf8
-                       Perl_tounixspec_utf8_ts
-                       Perl_tovmspath
-                       Perl_tovmspath_ts
-                       Perl_tovmspath_utf8
-                       Perl_tovmspath_utf8_ts
-                       Perl_tovmsspec
-                       Perl_tovmsspec_ts
-                       Perl_tovmsspec_utf8
-                       Perl_tovmsspec_utf8_ts
-                       Perl_trim_unixpath
-                       Perl_vms_case_tolerant
-                       Perl_vms_do_aexec
-                       Perl_vms_do_exec
-                       Perl_vms_image_init
-                       Perl_vms_realpath
-                       Perl_vmssetenv
-                       Perl_vmssetuserlnm
-                       Perl_vmstrnenv
-                       PerlIO_openn
-                    ));
+if ($ARGS{PLATFORM} ne 'win32') {
+    ++$skip{$_} foreach qw(
+                   Perl_my_setlocale
+                        );
 }
 
 unless ($define{UNLINK_ALL_VERSIONS}) {
@@ -448,8 +252,9 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debstackptrs
                    Perl_pad_sv
                    Perl_pad_setsv
+                    Perl__setlocale_debug_string
+                   Perl_set_padlist
                    Perl_hv_assert
-                   PL_block_type
                    PL_watchaddr
                    PL_watchok
                    PL_watch_pvx
@@ -480,10 +285,14 @@ else {
                         );
 }
 
-unless ($define{'PERL_OLD_COPY_ON_WRITE'}) {
+unless ($define{'PERL_COPY_ON_WRITE'}) {
     ++$skip{Perl_sv_setsv_cow};
 }
 
+unless ($define{PERL_SAWAMPERSAND}) {
+    ++$skip{PL_sawampersand};
+}
+
 unless ($define{'USE_REENTRANT_API'}) {
     ++$skip{PL_reentrant_buffer};
 }
@@ -497,13 +306,8 @@ if ($define{'MYMALLOC'}) {
                    MallocCfg_ptr
                    MallocCfgP_ptr
                    ));
-    if ($define{'USE_ITHREADS'}) {
-       try_symbols(qw(
-                       PL_malloc_mutex
-                       ));
-    }
-    else {
-       ++$skip{PL_malloc_mutex};
+    unless ($define{USE_ITHREADS}) {
+       ++$skip{PL_malloc_mutex}
     }
 }
 else {
@@ -554,6 +358,7 @@ unless ($define{'USE_ITHREADS'}) {
 
 unless ($define{'USE_ITHREADS'}) {
     ++$skip{$_} foreach qw(
+                   PL_check_mutex
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
@@ -561,6 +366,11 @@ unless ($define{'USE_ITHREADS'}) {
                    PL_hints_mutex
                    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
@@ -611,25 +421,25 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                         );
 }
 
-unless ($define{'PL_OP_SLAB_ALLOC'}) {
-    ++$skip{$_} foreach qw(
-                     PL_OpPtr
-                     PL_OpSlab
-                     PL_OpSpace
-                    Perl_Slab_Alloc
-                    Perl_Slab_Free
-                        );
-}
-
-unless ($define{'PERL_DEBUG_READONLY_OPS'}) {
+unless ($define{'PERL_OP_PARENT'}) {
     ++$skip{$_} foreach qw(
-                   PL_slab_count
-                   PL_slabs
-                        );
-}
-
-unless ($define{'THREADS_HAVE_PIDS'}) {
-    ++$skip{PL_ppid};
+                   Perl_op_parent
+                );
+}
+
+if ($define{'NO_MATHOMS'}) {
+    # win32 builds happen in the win32/ subdirectory, but vms builds happen
+    # at the top level, so we need to look in two candidate locations for
+    # the mathoms.c file.
+    my ($file) = grep { -f } qw( mathoms.c ../mathoms.c )
+        or die "No mathoms.c file found in . or ..\n";
+    open my $mathoms, '<', $file
+        or die "Cannot open $file: $!\n";
+    while (<$mathoms>) {
+        ++$skip{$1} if /\A ( NATIVE_TO_NEED
+                           | ASCII_TO_NEED
+                           | Perl_\w+ ) \s* \( /axms;
+    }
 }
 
 unless ($define{'PERL_NEED_APPCTX'}) {
@@ -664,17 +474,10 @@ 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
+                   PL_interp_size_5_18_0
                         );
 }
 
@@ -695,6 +498,21 @@ unless ($define{HAS_MMAP}) {
 
 if ($define{HAS_SIGACTION}) {
     ++$skip{PL_sig_trapped};
+
+    if ($ARGS{PLATFORM} eq 'vms') {
+        # FAKE_PERSISTENT_SIGNAL_HANDLERS defined as !defined(HAS_SIGACTION)
+        ++$skip{PL_sig_ignoring};
+        ++$skip{PL_sig_handlers_initted} unless $define{KILL_BY_SIGPRC};
+    }
+}
+
+if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) {
+    # FAKE_DEFAULT_SIGNAL_HANDLERS defined as KILL_BY_SIGPRC
+    ++$skip{Perl_csighandler_init};
+    ++$skip{Perl_my_kill};
+    ++$skip{Perl_sig_to_vmscondition};
+    ++$skip{PL_sig_defaulting};
+    ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION};
 }
 
 unless ($define{USE_LOCALE_COLLATE}) {
@@ -718,6 +536,11 @@ unless ($define{USE_LOCALE_NUMERIC}) {
                         );
 }
 
+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
@@ -731,27 +554,24 @@ if ($define{HAS_SIGNBIT}) {
     ++$skip{Perl_signbit};
 }
 
-sub readvar {
-    my $file = shift;
-    my $proc = shift || sub { "PL_$_[2]" };
-    open my $vars, '<', $file or die die "Cannot open $file: $!\n";
-
-    # All symbols have a Perl_ prefix because that's what embed.h sticks
-    # in front of them.  The A?I?S?C? is strictly speaking wrong.
-    map {/\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/ ? &$proc($1,$2,$3) : ()} <$vars>;
-}
-
 if ($define{'PERL_GLOBAL_STRUCT'}) {
-    ++$skip{$_} foreach readvar($perlvars_h);
+    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 $CCTYPE eq 'GCC';
+    try_symbols(qw(PL_Vars PL_VarsPtr))
+      unless $ARGS{CCTYPE} eq 'GCC' || $define{PERL_GLOBAL_STRUCT_PRIVATE};
 } else {
     ++$skip{$_} foreach qw(Perl_init_global_struct Perl_free_global_struct);
 }
 
+++$skip{PL_op_exec_cnt}
+    unless $define{PERL_TRACE_OPS};
+
 # functions from *.sym files
 
-my @syms = ($global_sym, $globvar_sym);
+my @syms = qw(globvar.sym);
 
 # Symbols that are the public face of the PerlIO layers implementation
 # These are in _addition to_ the public face of the abstraction
@@ -764,6 +584,7 @@ my @layer_syms = qw(
                    PerlIOBase_eof
                    PerlIOBase_error
                    PerlIOBase_fileno
+                   PerlIOBase_open
                    PerlIOBase_noop_fail
                    PerlIOBase_noop_ok
                    PerlIOBase_popped
@@ -819,6 +640,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
@@ -830,191 +653,105 @@ my @layer_syms = qw(
                    Perl_PerlIO_unread
                    Perl_PerlIO_write
 );
-if ($PLATFORM eq 'netware') {
+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');
-    }
-    if ($define{'USE_ITHREADS'}) {
-       try_symbols(qw(
-                       PL_perlio_mutex
-                       ));
-    }
-    else {
-       ++$skip{PL_perlio_mutex};
-    }
-} 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
-                            );
+# 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');
+
+
+unless ($define{'USE_QUADMATH'}) {
+  ++$skip{Perl_quadmath_format_needed};
+  ++$skip{Perl_quadmath_format_single};
+}
 
-       # 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.
+###############################################################################
+
+# At this point all skip lists should be completed, as we are about to test
+# many symbols against them.
+
+{
+    my %seen;
+    my ($embed) = setup_embed($ARGS{TARG_DIR});
+
+    foreach (@$embed) {
+       my ($flags, $retval, $func, @args) = @$_;
+       next unless $func;
+       if ($flags =~ /[AX]/ && $flags !~ /[xmi]/ || $flags =~ /b/) {
+           # public API, so export
+
+           # If a function is defined twice, for example before and after
+           # an #else, only export its name once. Important to do this test
+           # within the block, as the *first* definition may have flags which
+           # mean "don't export"
+           next if $seen{$func}++;
+           # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ?
+           $func = "Perl_$func" if ($flags =~ /[pbX]/ && $func !~ /^Perl_/); 
+           ++$export{$func} unless exists $skip{$func};
+       }
+    }
 }
 
-for my $syms (@syms) {
-    open (GLOBAL, "<$syms") || die "failed to open $syms: $!\n";
-    while (<GLOBAL>) {
-       next if (!/^[A-Za-z]/);
-       # Functions have a Perl_ prefix
-       # Variables have a PL_ prefix
-       chomp($_);
-       my $symbol = ($syms =~ /var\.sym$/i ? "PL_" : "");
-       $symbol .= $_;
+foreach (@syms) {
+    my $syms = $ARGS{TARG_DIR} . $_;
+    open my $global, '<', $syms or die "failed to open $syms: $!\n";
+    while (<$global>) {
+       next unless /^([A-Za-z].*)/;
+       my $symbol = "$1";
        ++$export{$symbol} unless exists $skip{$symbol};
     }
-    close(GLOBAL);
 }
 
 # variables
 
 if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) {
-    for my $f ($perlvars_h) {
-       try_symbols(readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" }));
-    }
+    readvar('perlvars.h', \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
     # XXX AIX seems to want the perlvars.h symbols, for some reason
-    if ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') {    # OS/2 needs PL_thr_key
-       try_symbols(readvar($perlvars_h));
+    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'}) {
-       try_symbols(readvar($perlvars_h));
+       readvar('perlvars.h', \%export);
     }
     unless ($define{MULTIPLICITY}) {
-       try_symbols(readvar($intrpvar_h));
+       readvar('intrpvar.h', \%export);
     }
 }
 
-sub try_symbol {
-    my $symbol = shift;
-    ++$export{$symbol} unless $skip{$symbol};
-}
-
 # Oddities from PerlIO
+# All have alternate implementations in perlio.c, so always exist.
+# Should they be considered to be part of the API?
 try_symbols(qw(
                    PerlIO_binmode
                    PerlIO_getpos
                    PerlIO_init
                    PerlIO_setpos
-                   PerlIO_sprintf
-                   PerlIO_sv_dup
                    PerlIO_tmpfile
-                   PerlIO_vsprintf
             ));
 
-if ($PLATFORM eq 'win32') {
-    try_symbol($_) foreach qw(
-                                setgid
-                                setuid
+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} eq 'wince') {
+    ++$skip{'win32_isatty'}; # commit 4342f4d6df is win32-only
 }
 
-if ($PLATFORM =~ /^win(?:32|ce)$/) {
-    foreach my $symbol (qw(
+if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
+    try_symbols(qw(
                            Perl_init_os_extras
                            Perl_thread_create
                            Perl_win32_init
@@ -1168,27 +905,164 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_puts
                            win32_getchar
                            win32_putchar
-                          ))
-    {
-       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';
-
-    @missing = grep { !exists $mapped{$_} }
-                   keys %export;
-    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
-    delete $export{$_} foreach @missing;
+                ));
 }
-elsif ($PLATFORM eq 'netware') {
-foreach my $symbol (qw(
+elsif ($ARGS{PLATFORM} eq 'vms') {
+    try_symbols(qw(
+                     Perl_cando
+                     Perl_cando_by_name
+                     Perl_closedir
+                     Perl_csighandler_init
+                     Perl_do_rmdir
+                     Perl_fileify_dirspec
+                     Perl_fileify_dirspec_ts
+                     Perl_fileify_dirspec_utf8
+                     Perl_fileify_dirspec_utf8_ts
+                     Perl_flex_fstat
+                     Perl_flex_lstat
+                     Perl_flex_stat
+                     Perl_kill_file
+                     Perl_my_chdir
+                     Perl_my_chmod
+                     Perl_my_crypt
+                     Perl_my_endpwent
+                     Perl_my_fclose
+                     Perl_my_fdopen
+                     Perl_my_fgetname
+                     Perl_my_flush
+                     Perl_my_fwrite
+                     Perl_my_gconvert
+                     Perl_my_getenv
+                     Perl_my_getenv_len
+                     Perl_my_getpwnam
+                     Perl_my_getpwuid
+                     Perl_my_gmtime
+                     Perl_my_kill
+                     Perl_my_killpg
+                     Perl_my_localtime
+                     Perl_my_mkdir
+                     Perl_my_sigaction
+                     Perl_my_symlink
+                     Perl_my_time
+                     Perl_my_tmpfile
+                     Perl_my_trnlnm
+                     Perl_my_utime
+                     Perl_my_waitpid
+                     Perl_opendir
+                     Perl_pathify_dirspec
+                     Perl_pathify_dirspec_ts
+                     Perl_pathify_dirspec_utf8
+                     Perl_pathify_dirspec_utf8_ts
+                     Perl_readdir
+                     Perl_readdir_r
+                     Perl_rename
+                     Perl_rmscopy
+                     Perl_rmsexpand
+                     Perl_rmsexpand_ts
+                     Perl_rmsexpand_utf8
+                     Perl_rmsexpand_utf8_ts
+                     Perl_seekdir
+                     Perl_sig_to_vmscondition
+                     Perl_telldir
+                     Perl_tounixpath
+                     Perl_tounixpath_ts
+                     Perl_tounixpath_utf8
+                     Perl_tounixpath_utf8_ts
+                     Perl_tounixspec
+                     Perl_tounixspec_ts
+                     Perl_tounixspec_utf8
+                     Perl_tounixspec_utf8_ts
+                     Perl_tovmspath
+                     Perl_tovmspath_ts
+                     Perl_tovmspath_utf8
+                     Perl_tovmspath_utf8_ts
+                     Perl_tovmsspec
+                     Perl_tovmsspec_ts
+                     Perl_tovmsspec_utf8
+                     Perl_tovmsspec_utf8_ts
+                     Perl_trim_unixpath
+                     Perl_vms_case_tolerant
+                     Perl_vms_do_aexec
+                     Perl_vms_do_exec
+                     Perl_vms_image_init
+                     Perl_vms_realpath
+                     Perl_vmssetenv
+                     Perl_vmssetuserlnm
+                     Perl_vmstrnenv
+                     PerlIO_openn
+                ));
+}
+elsif ($ARGS{PLATFORM} eq 'os2') {
+    try_symbols(qw(
+                     ctermid
+                     get_sysinfo
+                     Perl_OS2_init
+                     Perl_OS2_init3
+                     Perl_OS2_term
+                     OS2_Perl_data
+                     dlopen
+                     dlsym
+                     dlerror
+                     dlclose
+                     dup2
+                     dup
+                     my_tmpfile
+                     my_tmpnam
+                     my_flock
+                     my_rmdir
+                     my_mkdir
+                     my_getpwuid
+                     my_getpwnam
+                     my_getpwent
+                     my_setpwent
+                     my_endpwent
+                     fork_with_resources
+                     croak_with_os2error
+                     setgrent
+                     endgrent
+                     getgrent
+                     malloc_mutex
+                     threads_mutex
+                     nthreads
+                     nthreads_cond
+                     os2_cond_wait
+                     os2_stat
+                     os2_execname
+                     async_mssleep
+                     msCounter
+                     InfoTable
+                     pthread_join
+                     pthread_create
+                     pthread_detach
+                     XS_Cwd_change_drive
+                     XS_Cwd_current_drive
+                     XS_Cwd_extLibpath
+                     XS_Cwd_extLibpath_set
+                     XS_Cwd_sys_abspath
+                     XS_Cwd_sys_chdir
+                     XS_Cwd_sys_cwd
+                     XS_Cwd_sys_is_absolute
+                     XS_Cwd_sys_is_relative
+                     XS_Cwd_sys_is_rooted
+                     XS_DynaLoader_mod2fname
+                     XS_File__Copy_syscopy
+                     Perl_Register_MQ
+                     Perl_Deregister_MQ
+                     Perl_Serve_Messages
+                     Perl_Process_Messages
+                     init_PMWIN_entries
+                     PMWIN_entries
+                     Perl_hab_GET
+                     loadByOrdinal
+                     pExtFCN
+                     os2error
+                     ResetWinError
+                     CroakWinError
+                     PL_do_undump
+                ));
+}
+elsif ($ARGS{PLATFORM} eq 'netware') {
+    try_symbols(qw(
                        Perl_init_os_extras
                        Perl_thread_create
                        Perl_nw5_init
@@ -1323,69 +1197,106 @@ foreach my $symbol (qw(
                        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);
-    }
+# When added this code was only run for Win32 and WinCE
+# 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.
 
-try_symbol("init_Win32CORE") if $static_ext =~ /\bWin32CORE\b/;
+if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
+    # records of type boot_module for statically linked modules (except Dynaloader)
+    my $static_ext = $Config{static_ext} // "";
+    $static_ext =~ s/\//__/g;
+    $static_ext =~ s/\bDynaLoader\b//;
+    try_symbols(map {"boot_$_"} grep {/\S/} split /\s+/, $static_ext);
+    try_symbols("init_Win32CORE") if $static_ext =~ /\bWin32CORE\b/;
+}
 
-# Now all symbols should be defined because
-# next we are going to output them.
+if ($ARGS{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';
 
-foreach my $symbol (sort keys %export) {
-    output_symbol($symbol);
+    @missing = grep { !exists $mapped{$_} }
+                   keys %export;
+    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
+    delete $export{$_} foreach @missing;
 }
 
-if ($PLATFORM eq 'os2') {
-       print <<EOP;
-    dll_perlmain=main
-    fill_extLibpath
-    dir_subst
-    Perl_OS2_handler_install
+###############################################################################
 
-; LAST_ORDINAL=$sym_ord
-EOP
+# Now all symbols should be defined because next we are going to output them.
+
+# Start with platform specific headers:
+
+if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
+    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)$/) {
+       print "DESCRIPTION 'Perl interpreter'\n";
+    }
+    print "EXPORTS\n";
+}
+elsif ($ARGS{PLATFORM} eq 'os2') {
+    (my $v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
+    $v .= '-thread' if $Config{archname} =~ /-thread/;
+    (my $dll = $define{PERL_DLL}) =~ s/\.dll$//i;
+    $v .= "\@$Config{perl_patchlevel}" if $Config{perl_patchlevel};
+    my $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $Config{config_args}'";
+    $d = substr($d, 0, 249) . "...'" if length $d > 253;
+    print <<"---EOP---";
+LIBRARY '$dll' INITINSTANCE TERMINSTANCE
+$d
+STACKSIZE 32768
+CODE LOADONCALL
+DATA LOADONCALL NONSHARED MULTIPLE
+EXPORTS
+---EOP---
+}
+elsif ($ARGS{PLATFORM} eq 'aix') {
+    my $OSVER = `uname -v`;
+    chop $OSVER;
+    my $OSREL = `uname -r`;
+    chop $OSREL;
+    if ($OSVER > 4 || ($OSVER == 4 && $OSREL >= 3)) {
+       print "#! ..\n";
+    } else {
+       print "#!\n";
+    }
 }
+elsif ($ARGS{PLATFORM} eq 'netware') {
+       if ($ARGS{FILETYPE} eq 'def') {
+       print "LIBRARY perl$Config{api_revision}$Config{api_version}\n";
+       print "DESCRIPTION 'Perl interpreter for NetWare'\n";
+       print "EXPORTS\n";
+       }
+}
+
+# Then the symbols
 
-sub output_symbol {
-    my $symbol = shift;
-    if ($PLATFORM =~ /^win(?:32|ce)$/) {
-       $symbol = "_$symbol" if $CCTYPE eq 'BORLAND';
-       print "\t$symbol\n";
-# XXX: binary compatibility between compilers is an exercise
-# in frustration :-(
-#        if ($CCTYPE eq "BORLAND") {
-#          # workaround Borland quirk by exporting both the straight
-#          # name and a name with leading underscore.  Note the
-#          # alias *must* come after the symbol itself, if both
-#          # are to be exported. (Linker bug?)
-#          print "\t_$symbol\n";
-#          print "\t$symbol = _$symbol\n";
-#      }
-#      elsif ($CCTYPE eq 'GCC') {
-#          # Symbols have leading _ whole process is $%@"% slow
-#          # so skip aliases for now
-#          nprint "\t$symbol\n";
-#      }
-#      else {
-#          # for binary coexistence, export both the symbol and
-#          # alias with leading underscore
-#          print "\t$symbol\n";
-#          print "\t_$symbol = $symbol\n";
-#      }
+my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export;
+foreach my $symbol (@symbols) {
+    if (PLATFORM eq 'win32' || PLATFORM eq 'wince') {
+       # 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 ($PLATFORM eq 'os2') {
+    elsif (PLATFORM eq 'os2') {
        printf qq(    %-31s \@%s\n),
          qq("$symbol"), $ordinal{$symbol} || ++$sym_ord;
        printf qq(    %-31s \@%s\n),
@@ -1393,12 +1304,24 @@ sub output_symbol {
          $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord
          if $exportperlmalloc and exists $exportperlmalloc{$symbol};
     }
-    elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'vms') {
+    elsif (PLATFORM eq 'netware') {
+       print "\t$symbol,\n";
+    } else {
        print "$symbol\n";
     }
-       elsif ($PLATFORM eq 'netware') {
-       print "\t$symbol,\n";
-       }
+}
+
+# Then platform specific footers.
+
+if ($ARGS{PLATFORM} eq 'os2') {
+    print <<EOP;
+    dll_perlmain=main
+    fill_extLibpath
+    dir_subst
+    Perl_OS2_handler_install
+
+; LAST_ORDINAL=$sym_ord
+EOP
 }
 
 1;