Correct some #ifdef USE_ITHREADS / USE_MULTI

[p5sagit/p5-mst-13.2.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 2e1e2ba..858c1eb 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -6,10 +6,35 @@
 # and by AIX for creating libperl.a when -Dusershrplib is in effect,
 # and by MacOS Classic.
 #
-# reads global.sym, pp.sym, perlvars.h, intrpvar.h, config.h
-# On OS/2 reads miniperl.map and the previous version of perl5.def as well
+# Reads from information stored in
+#
+#    config.h
+#    config.sh
+#    global.sym
+#    globvar.sym
+#    intrpvar.h
+#    macperl.sym  (on MacOS)
+#    miniperl.map (on OS/2)
+#    perl5.def    (on OS/2; this is the old version of the file being made)
+#    perlio.sym
+#    perlvars.h
+#
+# plus long lists of function names hard-coded directly in this script and
+# in the DATA section.
+#
+# Writes the result to STDOUT.
+#
+# Normally this script is invoked from a makefile (e.g. win32/Makefile),
+# which redirects STDOUT to a suitable file, such as:
+#
+#    perl5.def   OS/2
+#    perldll.def Windows
+#    perl.exp    AIX
+#    perl.imp    NetWare
+
 
 BEGIN { unshift @INC, "lib" }
+use Config;
 use strict;
 
 use vars qw($PLATFORM $CCTYPE $FILETYPE $CONFIG_ARGS $ARCHNAME $PATCHLEVEL);
@@ -51,7 +76,11 @@ if ($PLATFORM eq 'win32' or $PLATFORM eq 'wince' or $PLATFORM eq "aix") {
        # the user might have chosen to disable because the canned configs are
        # minimal configs that don't include any of those options.
        my $opts = ($PLATFORM eq 'wince' ? '-MCross' : ''); # for wince need Cross.pm to get Config.pm
-       my $config = `$^X $opts -Ilib -V`;
+
+       $ENV{PERL5LIB} = join $Config{path_sep}, @INC;
+       my $cmd = "$^X $opts -V";
+       my $config = `$cmd`
+           or die "Couldn't run [$cmd]: $!";
        my($options) = $config =~ /^  Compile-time options: (.*?)\n^  \S/ms;
        $options =~ s/\s+/ /g;
        print STDERR "Options: ($options)\n";
@@ -129,6 +158,7 @@ while (<CFG>) {
     $define{$1} = 1 if /^\s*#\s*define\s+(MULTIPLICITY)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(PERL_\w+)\b/;
     $define{$1} = 1 if /^\s*#\s*define\s+(USE_\w+)\b/;
+    $define{$1} = 1 if /^\s*#\s*define\s+(HAS_\w+)\b/;
 }
 close(CFG);
 
@@ -404,9 +434,13 @@ elsif ($PLATFORM eq 'aix') {
                     PL_statusvalue_vms
                     PL_sys_intern
                     )]);
+    skip_symbols([qw(
+                    Perl_signbit
+                    )])
+       if $define{'HAS_SIGNBIT'};
     emit_symbols([qw(
                     boot_DynaLoader
-                    )]);}
+                    )]);
 }
 elsif ($PLATFORM eq 'os2') {
     emit_symbols([qw(
@@ -596,7 +630,6 @@ unless ($define{'DEBUGGING'}) {
                    Perl_debstack
                    Perl_debstackptrs
                    Perl_pad_sv
-                   Perl_sv_peek
                    Perl_hv_assert
                    PL_block_type
                    PL_watchaddr
@@ -725,6 +758,7 @@ unless ($define{'USE_ITHREADS'}) {
                    PL_sharedsv_space_mutex
                    PL_dollarzero_mutex
                    PL_hints_mutex
+                   PL_my_ctx_mutex
                    PL_perlio_mutex
                    PL_regdupe
                    Perl_parser_dup
@@ -760,7 +794,6 @@ 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
@@ -827,6 +860,12 @@ unless ($define{'PERL_NEED_TIMESBASE'}) {
                    )];
 }
 
+unless ($define{'DEBUG_LEAKING_SCALARS'}) {
+    skip_symbols [qw(
+                   PL_sv_serial
+                   )];
+}
+
 unless ($define{'DEBUG_LEAKING_SCALARS_FORK_DUMP'}) {
     skip_symbols [qw(
                    PL_dumper_fd
@@ -1003,8 +1042,10 @@ my @layer_syms = qw(
                    PerlIO_arg_fetch
                    PerlIO_debug
                    PerlIO_define_layer
+                   PerlIO_find_layer
                    PerlIO_isutf8
                    PerlIO_layer_fetch
+                   PerlIO_list_alloc
                    PerlIO_list_free
                    PerlIO_modestr
                    PerlIO_parse_layers
@@ -1243,6 +1284,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_open
                            win32_close
                            win32_eof
+                           win32_isatty
                            win32_read
                            win32_write
                            win32_spawnvp