integrate cfgperl changes into mainline

[perl5.git] / makedef.pl

diff --git a/makedef.pl b/makedef.pl
index 9c2e96a..2e74878 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -100,6 +100,33 @@ while (<CFG>) {
 }
 close(CFG);
 
+# perl.h logic duplication begins
+
+if ($define{USE_ITHREADS}) {
+    if (!$define{MULTIPLICITY} && !$define{PERL_OBJECT}) {
+        $define{MULTIPLICITY} = 1;
+    }
+}
+
+$define{PERL_IMPLICIT_CONTEXT} ||=
+    $define{USE_ITHREADS} ||
+    $define{USE_5005THREADS}  ||
+    $define{MULTIPLICITY} ;
+
+if ($define{PERL_CAPI}) {
+    delete $define{PERL_OBJECT};
+    $define{MULTIPLICITY} = 1; 
+    $define{PERL_IMPLICIT_CONTEXT} = 1;
+    $define{PERL_IMPLICIT_SYS}     = 1;
+}
+
+if ($define{PERL_OBJECT}) {
+    $define{PERL_IMPLICIT_CONTEXT} = 1;
+    $define{PERL_IMPLICIT_SYS}     = 1;
+}
+
+# perl.h logic duplication ends
+
 if ($PLATFORM eq 'win32') {
     warn join(' ',keys %define)."\n";
     print "LIBRARY Perl56\n";
@@ -227,6 +254,7 @@ elsif ($PLATFORM eq 'aix') {
                     Perl_safexrealloc
                     Perl_same_dirent
                     Perl_unlnk
+                    Perl_sys_intern_dup
                     PL_cryptseen
                     PL_opsave
                     PL_statusvalue_vms
@@ -242,6 +270,7 @@ elsif ($PLATFORM eq 'os2') {
                    dlopen
                    dlsym
                    dlerror
+                   dlclose
                    my_tmpfile
                    my_tmpnam
                    my_flock
@@ -313,9 +342,18 @@ else {
                    )];
 }
 
+unless ($define{'PERL_FLEXIBLE_EXCEPTIONS'}) {
+    skip_symbols [qw(
+                   PL_protect
+                   Perl_default_protect
+                   Perl_vdefault_protect
+                   )];
+}
+
 if ($define{'MYMALLOC'}) {
     emit_symbols [qw(
                    Perl_dump_mstats
+                   Perl_get_mstats
                    Perl_malloc
                    Perl_mfree
                    Perl_realloc
@@ -326,11 +364,17 @@ if ($define{'MYMALLOC'}) {
                        PL_malloc_mutex
                        )];
     }
+    else {
+       skip_symbols [qw(
+                       PL_malloc_mutex
+                       )];
+    }
 }
 else {
     skip_symbols [qw(
                    PL_malloc_mutex
                    Perl_dump_mstats
+                   Perl_get_mstats
                    Perl_malloc
                    Perl_mfree
                    Perl_realloc
@@ -356,8 +400,6 @@ unless ($define{'USE_5005THREADS'}) {
                    PL_threadsv_names
                    PL_thrsv
                    PL_vtbl_mutex
-                   Perl_getTHR
-                   Perl_setTHR
                    Perl_condpair_magic
                    Perl_new_struct_thread
                    Perl_per_thread_magicals
@@ -371,6 +413,7 @@ unless ($define{'USE_5005THREADS'}) {
 unless ($define{'USE_ITHREADS'}) {
     skip_symbols [qw(
                    PL_ptr_table
+                   PL_op_mutex
                    Perl_dirp_dup
                    Perl_cx_dup
                    Perl_si_dup
@@ -398,6 +441,7 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) {
                    Perl_die_nocontext
                    Perl_deb_nocontext
                    Perl_form_nocontext
+                   Perl_load_module_nocontext
                    Perl_mess_nocontext
                    Perl_warn_nocontext
                    Perl_warner_nocontext
@@ -448,7 +492,7 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 
 # functions from *.sym files
 
-my @syms = ($global_sym, $pp_sym, $globvar_sym);
+my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 
 if ($define{'USE_PERLIO'}) {
      push @syms, $perlio_sym;
@@ -475,6 +519,11 @@ if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) {
        my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
        emit_symbols $glob;
     }
+    # XXX AIX seems to want the perlvars.h symbols, for some reason
+    if ($PLATFORM eq 'aix') {
+       my $glob = readvar($perlvars_h);
+       emit_symbols $glob;
+    }
 }
 else {
     unless ($define{'PERL_GLOBAL_STRUCT'}) {
@@ -509,14 +558,10 @@ while (<DATA>) {
 if ($PLATFORM eq 'win32') {
     foreach my $symbol (qw(
                            boot_DynaLoader
-                           Perl_getTHR
                            Perl_init_os_extras
-                           Perl_setTHR
                            Perl_thread_create
                            Perl_win32_init
                            RunPerl
-                           GetPerlInterpreter
-                           SetPerlInterpreter
                            win32_errno
                            win32_environ
                            win32_stdin