X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=makedef.pl;h=57d6c75f5e5b07ef2f104b4358ae31d08fb29444;hb=1182767ea8fd2e4c0bf1b4ebab9db9ac12fc142c;hp=0ee159d6cfc3e5566bc5b00e32dd9e0e77f04ad5;hpb=8852afe98d47e90a12c2f14d274e255e8ab59572;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/makedef.pl b/makedef.pl
index 0ee159d..57d6c75 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -36,7 +36,7 @@ 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") {
+if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' or $PLATFORM eq "aix") {
 	# Add the compile-time options that miniperl was built with to %define.
 	# On Win32 these are not the same options as perl itself will be built
 	# with since miniperl is built with a canned config (one of the win32/
@@ -45,7 +45,8 @@ if ($PLATFORM eq 'win32' or $PLATFORM eq "aix") {
 	# 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 $opts = ($PLATFORM eq 'wince' ? '-MCross' : ''); # for wince need Cross.pm to get Config.pm
+	my $config = `$^X $opts -Ilib -V`;
 	my($options) = $config =~ /^  Compile-time options: (.*?)\n^  \S/ms;
 	$options =~ s/\s+/ /g;
 	print STDERR "Options: ($options)\n";
@@ -250,7 +251,6 @@ if ($PLATFORM eq 'win32') {
 		     PL_linestart
 		     PL_modcount
 		     PL_pending_ident
-		     PL_sortcxix
 		     PL_sublex_info
 		     PL_timesbuf
 		     main
@@ -288,6 +288,7 @@ if ($PLATFORM eq 'win32') {
 		     Perl_getenv_len
 		     Perl_my_pclose
 		     Perl_my_popen
+		     Perl_my_sprintf
 		     )];
 }
 else {
@@ -308,7 +309,6 @@ if ($PLATFORM eq 'wince') {
 		     PL_linestart
 		     PL_modcount
 		     PL_pending_ident
-		     PL_sortcxix
 		     PL_sublex_info
 		     PL_timesbuf
 		     PL_collation_ix
@@ -365,6 +365,7 @@ if ($PLATFORM eq 'wince') {
 		     Perl_getenv_len
 		     Perl_my_pclose
 		     Perl_my_popen
+		     Perl_my_sprintf
 		     )];
 }
 elsif ($PLATFORM eq 'aix') {
@@ -509,7 +510,6 @@ elsif ($PLATFORM eq 'netware') {
 			PL_linestart
 			PL_modcount
 			PL_pending_ident
-			PL_sortcxix
 			PL_sublex_info
 			PL_timesbuf
 			main
@@ -583,7 +583,9 @@ unless ($define{'DEBUGGING'}) {
 		    Perl_debprofdump
 		    Perl_debstack
 		    Perl_debstackptrs
+		    Perl_pad_sv
 		    Perl_sv_peek
+		    Perl_hv_assert
 		    PL_block_type
 		    PL_watchaddr
 		    PL_watchok
@@ -662,12 +664,6 @@ else {
 		    )];
 }
 
-unless ($define{'PERL_MALLOC_WRAP'}) {
-    skip_symbols [qw(
-		    PL_memory_wrap
-		    )];
-}
-
 if ($define{'PERL_USE_SAFE_PUTENV'}) {
     skip_symbols [qw(
                    PL_use_safe_putenv
@@ -719,6 +715,7 @@ unless ($define{'USE_ITHREADS'}) {
 		    PL_sharedsv_space
 		    PL_sharedsv_space_mutex
 		    PL_dollarzero_mutex
+		    PL_hints_mutex
 		    Perl_dirp_dup
 		    Perl_cx_dup
 		    Perl_si_dup
@@ -756,6 +753,10 @@ unless ($define{'USE_ITHREADS'}) {
 
 unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
     skip_symbols [qw(
+		    PL_my_ctx_mutex
+		    PL_my_cxt_index
+		    PL_my_cxt_list
+		    PL_my_cxt_size
 		    Perl_croak_nocontext
 		    Perl_die_nocontext
 		    Perl_deb_nocontext
@@ -769,6 +770,7 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
 		    Perl_sv_setpvf_nocontext
 		    Perl_sv_catpvf_mg_nocontext
 		    Perl_sv_setpvf_mg_nocontext
+		    Perl_my_cxt_init
 		    )];
 }
 
@@ -819,6 +821,63 @@ unless ($define{'PERL_DONT_CREATE_GVSV'}) {
 		     Perl_gv_SVadd
 		    )];
 }
+if ($define{'SPRINTF_RETURNS_STRLEN'}) {
+    skip_symbols [qw(
+		     Perl_my_sprintf
+		    )];
+}
+unless ($define{'PERL_USES_PL_PIDSTATUS'}) {
+    skip_symbols [qw(
+		     Perl_pidgone
+		     PL_pidstatus
+		    )];
+}
+
+unless ($define{'PERL_TRACK_MEMPOOL'}) {
+    skip_symbols [qw(
+                     PL_memory_debug_header
+                    )];
+}
+
+if ($define{'PERL_MAD'}) {
+    skip_symbols [qw(
+		     PL_nextval
+		     PL_nexttype
+		     )];
+} else {
+    skip_symbols [qw(
+		    PL_madskills
+		    PL_xmlfp
+		    PL_lasttoke
+		    PL_realtokenstart
+		    PL_faketokens
+		    PL_thismad
+		    PL_thistoken
+		    PL_thisopen
+		    PL_thisstuff
+		    PL_thisclose
+		    PL_thiswhite
+		    PL_nextwhite
+		    PL_skipwhite
+		    PL_endwhite
+		    PL_curforce
+		    Perl_pad_peg
+		    Perl_xmldump_indent
+		    Perl_xmldump_vindent
+		    Perl_xmldump_all
+		    Perl_xmldump_packsubs
+		    Perl_xmldump_sub
+		    Perl_xmldump_form
+		    Perl_xmldump_eval
+		    Perl_sv_catxmlsv
+		    Perl_sv_catxmlpvn
+		    Perl_sv_xmlpeek
+		    Perl_do_pmop_xmldump
+		    Perl_pmop_xmldump
+		    Perl_do_op_xmldump
+		    Perl_op_xmldump
+		    )];
+}
 
 unless ($define{'d_mmap'}) {
     skip_symbols [qw(
@@ -920,6 +979,7 @@ my @layer_syms = qw(
 		    PerlIO_sv_dup
 		    Perl_PerlIO_clearerr
 		    Perl_PerlIO_close
+		    Perl_PerlIO_context_layers
 		    Perl_PerlIO_eof
 		    Perl_PerlIO_error
 		    Perl_PerlIO_fileno
@@ -1514,17 +1574,6 @@ sub output_symbol {
 
 1;
 __DATA__
-# extra globals not included above.
-Perl_cxinc
-perl_alloc
-perl_alloc_using
-perl_clone
-perl_clone_using
-perl_construct
-perl_destruct
-perl_free
-perl_parse
-perl_run
 # Oddities from PerlIO
 PerlIO_binmode
 PerlIO_getpos