X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=makedef.pl;h=1a6f57177465408e19404c67d1a40e779b02293b;hb=a9a28921a06508e1ec8a1da7fdf58c72faa64c96;hp=54d766f6c509c4e9e3fe4b1fa1d1514cd7d200ed;hpb=8cd36dc7fe95dcdad5bd5d092d75d9857b87d20a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/makedef.pl b/makedef.pl
index 54d766f..1a6f571 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -6,62 +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;
 
-my %bincompat5005 =
-      (
-       Perl_call_atexit		=>	"perl_atexit",
-       Perl_eval_sv		=>	"perl_eval_sv",
-       Perl_eval_pv		=>	"perl_eval_pv",
-       Perl_call_argv		=>	"perl_call_argv",
-       Perl_call_method		=>	"perl_call_method",
-       Perl_call_pv		=>	"perl_call_pv",
-       Perl_call_sv		=>	"perl_call_sv",
-       Perl_get_av		=>	"perl_get_av",
-       Perl_get_cv		=>	"perl_get_cv",
-       Perl_get_hv		=>	"perl_get_hv",
-       Perl_get_sv		=>	"perl_get_sv",
-       Perl_init_i18nl10n	=>	"perl_init_i18nl10n",
-       Perl_init_i18nl14n	=>	"perl_init_i18nl14n",
-       Perl_new_collate		=>	"perl_new_collate",
-       Perl_new_ctype		=>	"perl_new_ctype",
-       Perl_new_numeric		=>	"perl_new_numeric",
-       Perl_require_pv		=>	"perl_require_pv",
-       Perl_safesyscalloc	=>	"Perl_safecalloc",
-       Perl_safesysfree		=>	"Perl_safefree",
-       Perl_safesysmalloc	=>	"Perl_safemalloc",
-       Perl_safesysrealloc	=>	"Perl_saferealloc",
-       Perl_set_numeric_local	=>	"perl_set_numeric_local",
-       Perl_set_numeric_standard  =>	"perl_set_numeric_standard",
-       Perl_malloc		=>	"malloc",
-       Perl_mfree		=>	"free",
-       Perl_realloc		=>	"realloc",
-       Perl_calloc		=>	"calloc",
-      );
-
-my $bincompat5005 = join("|", keys %bincompat5005);
-
 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";
@@ -75,7 +59,7 @@ my $perlio_sym  = "perlio.sym";
 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) {
@@ -89,7 +73,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)='(.+)'$/) {
@@ -97,8 +81,9 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware')
 	    $define{$1} = 1 while /-D(\w+)/g;
 	}
 	if ($PLATFORM eq 'os2') {
-	    $CONFIG_ARGS = $1 if /^(?:config_args)='(.+)'$/;
-	    $ARCHNAME =    $1 if /^(?:archname)='(.+)'$/;
+	    $CONFIG_ARGS = $1 if /^config_args='(.+)'$/;
+	    $ARCHNAME =    $1 if /^archname='(.+)'$/;
+	    $PATCHLEVEL =  $1 if /^perl_patchlevel='(.+)'$/;
 	}
     }
     close(CFG);
@@ -115,6 +100,10 @@ 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;
@@ -123,26 +112,46 @@ 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') {
+    $define{USE_REENTRANT_API} = 1;
+}
+
 # perl.h logic duplication ends
 
-if ($PLATFORM eq 'win32') {
+my $sym_ord = 0;
+
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
     warn join(' ',keys %define)."\n";
-    print "LIBRARY Perl57\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");
-    output_symbol("perl_clone_host");
+    }
+    if ($define{USE_ITHREADS} and $define{PERL_IMPLICIT_SYS}) {
+	output_symbol("perl_clone_host");
     }
 }
 elsif ($PLATFORM eq 'os2') {
+    if (open my $fh, '<', 'perl5.def') {
+      while (<$fh>) {
+	last if /^\s*EXPORTS\b/;
+      }
+      while (<$fh>) {
+	$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*$/;
+      }
+      $sym_ord < $_ and $sym_ord = $_ for values %ordinal; # Take the max
+    }
     ($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
     $v .= '-thread' if $ARCHNAME =~ /-thread/;
     ($dll = $define{PERL_DLL}) =~ s/\.dll$//i;
+    $v .= "\@$PATCHLEVEL" if $PATCHLEVEL;
     $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'";
     $d = substr($d, 0, 249) . "...'" if length $d > 253;
     print <<"---EOP---";
@@ -167,14 +176,14 @@ elsif ($PLATFORM eq 'aix') {
 }
 elsif ($PLATFORM eq 'netware') {
 	if ($FILETYPE eq 'def') {
-	print "LIBRARY Perl57\n";
+	print "LIBRARY perl59\n";
 	print "DESCRIPTION 'Perl interpreter for NetWare'\n";
 	print "EXPORTS\n";
 	}
 	if ($define{PERL_IMPLICIT_SYS}) {
-	output_symbol("perl_get_host_info");
-	output_symbol("perl_alloc_override");
-    output_symbol("perl_clone_host");
+	    output_symbol("perl_get_host_info");
+	    output_symbol("perl_alloc_override");
+	    output_symbol("perl_clone_host");
 	}
 }
 
@@ -251,6 +260,84 @@ if ($PLATFORM eq 'win32') {
 		     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_async_check
+		     win32_free_childdir
+		     win32_free_childenv
+		     win32_get_childdir
+		     win32_get_childenv
+		     win32_spawnvp
+		     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
+		     )];
+}
 elsif ($PLATFORM eq 'aix') {
     skip_symbols([qw(
 		     Perl_dump_fds
@@ -334,7 +421,17 @@ elsif ($PLATFORM eq 'os2') {
 		    Perl_hab_GET
 		    loadByOrdinal
 		    pExtFCN
+		    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(
@@ -412,6 +509,33 @@ elsif ($PLATFORM eq 'netware') {
 			Perl_getenv_len
 			Perl_my_pclose
 			Perl_my_popen
+			Perl_sys_intern_init
+			Perl_sys_intern_dup
+			Perl_sys_intern_clear
+			Perl_my_bcopy
+			Perl_PerlIO_write
+			Perl_PerlIO_unread
+			Perl_PerlIO_tell
+			Perl_PerlIO_stdout
+			Perl_PerlIO_stdin
+			Perl_PerlIO_stderr
+			Perl_PerlIO_setlinebuf
+			Perl_PerlIO_set_ptrcnt
+			Perl_PerlIO_set_cnt
+			Perl_PerlIO_seek
+			Perl_PerlIO_read
+			Perl_PerlIO_get_ptr
+			Perl_PerlIO_get_cnt
+			Perl_PerlIO_get_bufsiz
+			Perl_PerlIO_get_base
+			Perl_PerlIO_flush
+			Perl_PerlIO_fill
+			Perl_PerlIO_fileno
+			Perl_PerlIO_error
+			Perl_PerlIO_eof
+			Perl_PerlIO_close
+			Perl_PerlIO_clearerr
+			PerlIO_perlio
 			)];
 }
 
@@ -422,7 +546,6 @@ unless ($define{'DEBUGGING'}) {
 		    Perl_debprofdump
 		    Perl_debstack
 		    Perl_debstackptrs
-		    Perl_runops_debug
 		    Perl_sv_peek
 		    PL_block_type
 		    PL_watchaddr
@@ -451,6 +574,13 @@ else {
 		    )];
 }
 
+unless ($define{'PERL_COPY_ON_WRITE'}) {
+    skip_symbols [qw(
+		    Perl_sv_setsv_cow
+		    Perl_sv_release_IVX
+		  )];
+}
+
 unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
     skip_symbols [qw(
 		    PL_protect
@@ -472,7 +602,7 @@ if ($define{'MYMALLOC'}) {
 		    Perl_strdup
 		    Perl_putenv
 		    )];
-    if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+    if ($define{'USE_ITHREADS'}) {
 	emit_symbols [qw(
 			PL_malloc_mutex
 			)];
@@ -492,13 +622,13 @@ else {
 		    )];
 }
 
-unless ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
+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
@@ -525,7 +655,6 @@ unless ($define{'USE_5005THREADS'}) {
 		    Perl_magic_mutexfree
 		    Perl_sv_lock
 		    )];
-}
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
@@ -535,6 +664,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
@@ -596,6 +726,18 @@ unless ($define{'FAKE_THREADS'}) {
     skip_symbols [qw(PL_curthr)];
 }
 
+unless ($define{'PL_OP_SLAB_ALLOC'}) {
+    skip_symbols [qw(
+                     PL_OpPtr
+                     PL_OpSlab
+                     PL_OpSpace
+                    )];
+}
+
+unless ($define{'THREADS_HAVE_PIDS'}) {
+    skip_symbols [qw(PL_ppid)];
+}
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };
@@ -610,11 +752,6 @@ sub readvar {
     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;
@@ -626,6 +763,9 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 
 my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 
+# Symbols that are the public face of the PerlIO layers implementation
+# 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
@@ -633,37 +773,88 @@ my @layer_syms = qw(
 			 PerlIOBase_eof
 			 PerlIOBase_error
 			 PerlIOBase_fileno
-			 PerlIOBase_setlinebuf
 			 PerlIOBase_pushed
+			 PerlIOBase_binmode
+			 PerlIOBase_popped
 			 PerlIOBase_read
-		         PerlIOBase_unread
+			 PerlIOBase_setlinebuf
+			 PerlIOBase_unread
+			 PerlIOBase_noop_ok
+			 PerlIOBase_noop_fail
 			 PerlIOBuf_bufsiz
 			 PerlIOBuf_fill
 			 PerlIOBuf_flush
+			 PerlIOBuf_get_base
 			 PerlIOBuf_get_cnt
 			 PerlIOBuf_get_ptr
 			 PerlIOBuf_open
 			 PerlIOBuf_pushed
+			 PerlIOBuf_popped
 			 PerlIOBuf_read
 			 PerlIOBuf_seek
 			 PerlIOBuf_set_ptrcnt
 			 PerlIOBuf_tell
 			 PerlIOBuf_unread
 			 PerlIOBuf_write
-			 PerlIO_define_layer
+			 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_allocate
 			 PerlIO_push
+			 PerlIO_pop
 			 PerlIO_sv_dup
-			 PerlIO_unread
+			 PerlIO_perlio
+			 PerlIO_syslayer
+
+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
+    # 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_symbols \@layer_syms;
 	# 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_symbols [qw(
 			 PerlIO_canset_cnt
 			 PerlIO_clearerr
@@ -706,11 +897,49 @@ if ($define{'USE_PERLIO'}) {
 			 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
+	emit_symbols \@layer_syms;
+    }
 } else {
-	# Skip the PerlIO New Generation symbols.
+	# -Uuseperlio
+	# Skip the PerlIO layer symbols - although
+	# nothing should have exported them any way
 	skip_symbols \@layer_syms;
+        skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
+
+	# Also do NOT add abstraction symbols from $perlio_sym
+	# abstraction is done as #define to stdio
+	# Remaining remnants that _may_ be functions
+	# are handled in <DATA>
 }
 
 for my $syms (@syms) {
@@ -735,7 +964,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;
     }
@@ -749,7 +978,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;
     }
@@ -770,7 +999,7 @@ while (<DATA>) {
     try_symbol($_);
 }
 
-if ($PLATFORM eq 'win32') {
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
     foreach my $symbol (qw(
 			    setuid
 			    setgid
@@ -778,7 +1007,9 @@ if ($PLATFORM eq 'win32') {
 			    Perl_init_os_extras
 			    Perl_thread_create
 			    Perl_win32_init
+			    Perl_win32_term
 			    RunPerl
+			    win32_async_check
 			    win32_errno
 			    win32_environ
 			    win32_abort
@@ -866,6 +1097,7 @@ if ($PLATFORM eq 'win32') {
 			    win32_link
 			    win32_unlink
 			    win32_utime
+			    win32_gettimeofday
 			    win32_uname
 			    win32_wait
 			    win32_waitpid
@@ -882,7 +1114,11 @@ if ($PLATFORM eq 'win32') {
 			    win32_getpid
 			    win32_crypt
 			    win32_dynaload
-
+			    win32_get_childenv
+			    win32_free_childenv
+			    win32_clearenv
+			    win32_get_childdir
+			    win32_free_childdir
 			    win32_stdin
 			    win32_stdout
 			    win32_stderr
@@ -933,8 +1169,9 @@ elsif ($PLATFORM eq 'os2') {
     /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>;
     close MAP or die 'Cannot close miniperl.map';
 
-    @missing = grep { !exists $mapped{$_} and !exists $bincompat5005{$_} }
+    @missing = grep { !exists $mapped{$_} }
 		    keys %export;
+    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
     delete $export{$_} foreach @missing;
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -1053,6 +1290,7 @@ foreach my $symbol (qw(
 			nw_setprotoent
 			nw_setservent
 			nw_setsockopt
+			nw_inet_ntoa
 			nw_shutdown
 			nw_crypt
 			nw_execvp
@@ -1076,6 +1314,12 @@ foreach my $symbol (qw(
 			fnInsertHashListAddrs
 			fnGetHashListAddrs
 			Perl_deb
+			Perl_sv_setsv
+			Perl_sv_catsv
+			Perl_sv_catpvn
+			Perl_sv_2pv
+			nw_freeenviron
+			Remove_Thread_Ctx
 			   ))
     {
 	try_symbol($symbol);
@@ -1089,11 +1333,8 @@ foreach my $symbol (sort keys %export) {
     output_symbol($symbol);
 }
 
-if ($PLATFORM eq 'netware') {
-	# This may not be the right way to do.  This is to make sure
-	# that the last symbol will not contain a comma else
-	# Watcom linker cribs
-	print "\tdummy\n";
+if ($PLATFORM eq 'os2') {
+	print "; LAST_ORDINAL=$sym_ord\n";
 }
 
 sub emit_symbol {
@@ -1102,13 +1343,9 @@ sub emit_symbol {
     $export{$symbol} = 1;
 }
 
-my $sym_ord = 0;
-
 sub output_symbol {
     my $symbol = shift;
-    $symbol = $bincompat5005{$symbol}
-	if $define{PERL_BINCOMPAT_5005} and $symbol =~ /^($bincompat5005)$/;
-    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
@@ -1134,7 +1371,12 @@ sub output_symbol {
 #	}
     }
     elsif ($PLATFORM eq 'os2') {
-	printf qq(    %-31s \@%s\n), qq("$symbol"), ++$sym_ord;
+	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";
@@ -1157,43 +1399,13 @@ perl_destruct
 perl_free
 perl_parse
 perl_run
-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_allocate
-PerlIO_apply_layers
-PerlIO_arg_fetch
+# Oddities from PerlIO
 PerlIO_binmode
-PerlIO_define_layer
-PerlIO_define_layer
 PerlIO_getpos
 PerlIO_init
-PerlIO_pending
-PerlIO_push
 PerlIO_setpos
 PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
-PerlIO_unread
 PerlIO_vsprintf
 perlsio_binmode