Work-in-progress - do not integrate yet

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

diff --git a/makedef.pl b/makedef.pl
index f22b34d..1a6f571 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -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,16 @@ my %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";
@@ -95,7 +112,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') {
@@ -108,7 +124,7 @@ my $sym_ord = 0;
 
 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 +142,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 +176,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";
        }
@@ -408,7 +424,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(
@@ -551,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
@@ -572,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
                        )];
@@ -592,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
@@ -625,7 +655,6 @@ unless ($define{'USE_5005THREADS'}) {
                    Perl_magic_mutexfree
                    Perl_sv_lock
                    )];
-}
 
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
@@ -635,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
@@ -704,6 +734,10 @@ unless ($define{'PL_OP_SLAB_ALLOC'}) {
                     )];
 }
 
+unless ($define{'THREADS_HAVE_PIDS'}) {
+    skip_symbols [qw(PL_ppid)];
+}
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };
@@ -718,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;
@@ -750,6 +779,8 @@ my @layer_syms = qw(
                         PerlIOBase_read
                         PerlIOBase_setlinebuf
                         PerlIOBase_unread
+                        PerlIOBase_noop_ok
+                        PerlIOBase_noop_fail
                         PerlIOBuf_bufsiz
                         PerlIOBuf_fill
                         PerlIOBuf_flush
@@ -781,6 +812,7 @@ my @layer_syms = qw(
                         PerlIO_pop
                         PerlIO_sv_dup
                         PerlIO_perlio
+                        PerlIO_syslayer
 
 Perl_PerlIO_clearerr
 Perl_PerlIO_close
@@ -932,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;
     }
@@ -946,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;
     }
@@ -975,6 +1007,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
@@ -1138,6 +1171,7 @@ elsif ($PLATFORM eq 'os2') {
 
     @missing = grep { !exists $mapped{$_} }
                    keys %export;
+    @missing = grep { !exists $exportperlmalloc{$_} } @missing;
     delete $export{$_} foreach @missing;
 }
 elsif ($PLATFORM eq 'MacOS') {
@@ -1339,6 +1373,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";