s/PERL_COPY_ON_WRITE/PERL_OLD_COPY_ON_WRITE/g

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 8a9953c..0174ca0 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -55,6 +55,7 @@ my $global_sym  = "global.sym";
 my $pp_sym      = "pp.sym";
 my $globvar_sym = "globvar.sym";
 my $perlio_sym  = "perlio.sym";
+my $static_ext = "";
 
 if ($PLATFORM eq 'aix') {
     # Nothing for now.
@@ -62,13 +63,13 @@ if ($PLATFORM eq 'aix') {
 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) {
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!..\\!;
     }
 }
 elsif ($PLATFORM eq 'MacOS') {
     foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
-               $pp_sym, $globvar_sym, $perlio_sym) {
+            $pp_sym, $globvar_sym, $perlio_sym) {
        s!^!::!;
     }
 }
@@ -80,6 +81,9 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' ||
            $_ = $1;
            $define{$1} = 1 while /-D(\w+)/g;
        }
+        if (/^(d_(?:mmap|sigaction))='(.+)'$/) {
+            $define{$1} = $2;
+        }
        if ($PLATFORM eq 'os2') {
            $CONFIG_ARGS = $1 if /^config_args='(.+)'$/;
            $ARCHNAME =    $1 if /^archname='(.+)'$/;
@@ -88,6 +92,13 @@ unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' ||
     }
     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);
+}
 
 open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
 while (<CFG>) {
@@ -295,7 +306,6 @@ if ($PLATFORM eq 'wince') {
                     Perl_sv_collxfrm
                     setgid
                     setuid
-                    win32_async_check
                     win32_free_childdir
                     win32_free_childenv
                     win32_get_childdir
@@ -378,6 +388,8 @@ elsif ($PLATFORM eq 'os2') {
                    dlsym
                    dlerror
                    dlclose
+                   dup2
+                   dup
                    my_tmpfile
                    my_tmpnam
                    my_flock
@@ -399,6 +411,10 @@ elsif ($PLATFORM eq 'os2') {
                    nthreads_cond
                    os2_cond_wait
                    os2_stat
+                   os2_execname
+                   async_mssleep
+                   msCounter
+                   InfoTable
                    pthread_join
                    pthread_create
                    pthread_detach
@@ -552,6 +568,13 @@ unless ($define{'DEBUGGING'}) {
                    PL_block_type
                    PL_watchaddr
                    PL_watchok
+                   PL_watch_pvx
+                   )];
+}
+
+if ($define{'PERL_IMPLICIT_CONTEXT'}) {
+    skip_symbols [qw(
+                   PL_sig_sv
                    )];
 }
 
@@ -576,21 +599,13 @@ else {
                    )];
 }
 
-unless ($define{'PERL_COPY_ON_WRITE'}) {
+unless ($define{'PERL_OLD_COPY_ON_WRITE'}) {
     skip_symbols [qw(
                    Perl_sv_setsv_cow
                    Perl_sv_release_IVX
                  )];
 }
 
-unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
-    skip_symbols [qw(
-                   PL_protect
-                   Perl_default_protect
-                   Perl_vdefault_protect
-                   )];
-}
-
 unless ($define{'USE_REENTRANT_API'}) {
     skip_symbols [qw(
                    PL_reentrant_buffer
@@ -603,6 +618,8 @@ if ($define{'MYMALLOC'}) {
                    Perl_get_mstats
                    Perl_strdup
                    Perl_putenv
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
                    )];
     if ($define{'USE_ITHREADS'}) {
        emit_symbols [qw(
@@ -621,6 +638,14 @@ else {
                    Perl_dump_mstats
                    Perl_get_mstats
                    Perl_malloced_size
+                   MallocCfg_ptr
+                   MallocCfgP_ptr
+                   )];
+}
+
+unless ($define{'PERL_MALLOC_WRAP'}) {
+    skip_symbols [qw(
+                   PL_memory_wrap
                    )];
 }
 
@@ -661,9 +686,12 @@ unless ($define{'USE_ITHREADS'}) {
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_ptr_table
+                   PL_pte_root
+                   PL_pte_arenaroot
                    PL_op_mutex
                    PL_regex_pad
                    PL_regex_padav
+                   PL_shared_hek_table
                    PL_sharedsv_space
                    PL_sharedsv_space_mutex
                    PL_dollarzero_mutex
@@ -678,6 +706,8 @@ unless ($define{'USE_ITHREADS'}) {
                    Perl_mg_dup
                    Perl_re_dup
                    Perl_sv_dup
+                   Perl_rvpv_dup
+                   Perl_hek_dup
                    Perl_sys_intern_dup
                    Perl_ptr_table_clear
                    Perl_ptr_table_fetch
@@ -733,6 +763,8 @@ unless ($define{'PL_OP_SLAB_ALLOC'}) {
                      PL_OpPtr
                      PL_OpSlab
                      PL_OpSpace
+                    Perl_Slab_Alloc
+                    Perl_Slab_Free
                     )];
 }
 
@@ -740,6 +772,37 @@ unless ($define{'THREADS_HAVE_PIDS'}) {
     skip_symbols [qw(PL_ppid)];
 }
 
+unless ($define{'PERL_NEED_APPCTX'}) {
+    skip_symbols [qw(
+                   PL_appctx
+                   )];
+}
+
+unless ($define{'PERL_NEED_TIMESBASE'}) {
+    skip_symbols [qw(
+                   PL_timesbase
+                   )];
+}
+
+unless ($define{'d_mmap'}) {
+    skip_symbols [qw(
+                   PL_mmap_page_size
+                   )];
+}
+
+if ($define{'d_sigaction'}) {
+    skip_symbols [qw(
+                   PL_sig_trapped
+                   )];
+}
+
+if ($^O ne 'vms') {
+    # VMS does its own thing for these symbols.
+    skip_symbols [qw(PL_sig_handlers_initted
+                     PL_sig_ignoring
+                     PL_sig_defaulting)];
+}  
+
 sub readvar {
     my $file = shift;
     my $proc = shift || sub { "PL_$_[2]" };
@@ -747,8 +810,9 @@ sub readvar {
     my @syms;
     while (<VARS>) {
        # All symbols have a Perl_ prefix because that's what embed.h
-       # sticks in front of them.
-       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?C?)\(([IGT])(\w+)/);
+       # sticks in front of them.  The A?I?S?C? is strictly speaking
+       # wrong.
+       push(@syms, &$proc($1,$2,$3)) if (/\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/);
     }
     close(VARS);
     return \@syms;
@@ -759,6 +823,8 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
     skip_symbols $global;
     emit_symbol('Perl_GetVars');
     emit_symbols [qw(PL_Vars PL_VarsPtr)] unless $CCTYPE eq 'GCC';
+} else {
+    skip_symbols [qw(Perl_init_global_struct Perl_free_global_struct)];
 }
 
 # functions from *.sym files
@@ -779,6 +845,7 @@ my @layer_syms = qw(
                    PerlIOBase_noop_fail
                    PerlIOBase_noop_ok
                    PerlIOBase_popped
+                   PerlIOBase_pushed
                    PerlIOBase_read
                    PerlIOBase_setlinebuf
                    PerlIOBase_unread
@@ -800,10 +867,12 @@ my @layer_syms = qw(
                    PerlIOBuf_unread
                    PerlIOBuf_write
                    PerlIO_allocate
+                   PerlIO_apply_layera
                    PerlIO_apply_layers
                    PerlIO_arg_fetch
                    PerlIO_debug
                    PerlIO_define_layer
+                   PerlIO_isutf8
                    PerlIO_layer_fetch
                    PerlIO_list_free
                    PerlIO_modestr
@@ -849,6 +918,7 @@ if ($define{'USE_PERLIO'}) {
     if ($define{'USE_SFIO'}) {
        # Old legacy non-stdio "PerlIO"
        skip_symbols \@layer_syms;
+       skip_symbols [qw(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
@@ -926,12 +996,14 @@ if ($define{'USE_PERLIO'}) {
     else {
        # PerlIO with layers - export implementation
        emit_symbols \@layer_syms;
+       emit_symbols [qw(perlsio_binmode)];
     }
 } else {
        # -Uuseperlio
        # Skip the PerlIO layer symbols - although
-       # nothing should have exported them any way
+       # nothing should have exported them anyway.
        skip_symbols \@layer_syms;
+       skip_symbols [qw(perlsio_binmode)];
         skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
 
        # Also do NOT add abstraction symbols from $perlio_sym
@@ -1018,6 +1090,7 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) {
                            win32_pclose
                            win32_rename
                            win32_setmode
+                           win32_chsize
                            win32_lseek
                            win32_tell
                            win32_dup
@@ -1324,6 +1397,15 @@ foreach my $symbol (qw(
     }
 }
 
+# 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);
+    }
+
 # Now all symbols should be defined because
 # next we are going to output them.
 
@@ -1332,7 +1414,14 @@ foreach my $symbol (sort keys %export) {
 }
 
 if ($PLATFORM eq 'os2') {
-       print "; LAST_ORDINAL=$sym_ord\n";
+       print <<EOP;
+    dll_perlmain=main
+    fill_extLibpath
+    dir_subst
+    Perl_OS2_handler_install
+
+; LAST_ORDINAL=$sym_ord
+EOP
 }
 
 sub emit_symbol {
@@ -1406,4 +1495,3 @@ PerlIO_sprintf
 PerlIO_sv_dup
 PerlIO_tmpfile
 PerlIO_vsprintf
-perlsio_binmode