X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/1f7ae1bebc8320dc91487a39ea193bcc924a8bb3..dc7edc5c5d81282c7d6425fbd4bbf2b51a30a481:/makedef.pl?ds=sidebyside

diff --git a/makedef.pl b/makedef.pl
index 076b39a..1a44d1b 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -10,13 +10,14 @@
 #
 #    %Config::Config (ie config.sh)
 #    config.h
-#    global.sym
+#    embed.fnc
 #    globvar.sym
 #    intrpvar.h
 #    miniperl.map (on OS/2)
 #    perl5.def    (on OS/2; this is the old version of the file being made)
 #    perlio.sym
 #    perlvars.h
+#    regen/opcodes
 #
 # plus long lists of function names hard-coded directly in this script.
 #
@@ -35,7 +36,7 @@ BEGIN { unshift @INC, "lib" }
 use Config;
 use strict;
 
-my %ARGS = (CCTYPE => 'MSVC');
+my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => '');
 
 my %define;
 
@@ -54,6 +55,8 @@ while (@ARGV) {
     }
 }
 
+require "$ARGS{TARG_DIR}regen/embed_lib.pl";
+
 {
     my @PLATFORM = qw(aix win32 wince os2 netware vms test);
     my %PLATFORM;
@@ -94,19 +97,7 @@ my %exportperlmalloc =
 
 my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2';
 
-my $config_h    = "config.h";
-my $intrpvar_h  = "intrpvar.h";
-my $perlvars_h  = "perlvars.h";
-my $global_sym  = "global.sym";
-my $globvar_sym = "globvar.sym";
-my $perlio_sym  = "perlio.sym";
-
-if (exists $ARGS{TARG_DIR}) {
-    s/^/$ARGS{TARG_DIR}/
-	foreach $intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, $perlio_sym;
-}
-
-open(CFG,$config_h) || die "Cannot open $config_h: $!\n";
+open(CFG, '<', 'config.h') || die "Cannot open config.h: $!\n";
 while (<CFG>) {
     $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY
                                            |SPRINTF_RETURNS_STRLEN
@@ -172,7 +163,9 @@ sub readvar {
     # we're doing, as in that case we skip adding something to the skip hash
     # for the second time.
 
-    my ($file, $hash, $proc) = @_;
+    my $file = $ARGS{TARG_DIR} . shift;
+    my $hash = shift;
+    my $proc = shift;
     open my $vars, '<', $file or die die "Cannot open $file: $!\n";
 
     while (<$vars>) {
@@ -530,7 +523,7 @@ if ($define{HAS_SIGNBIT}) {
 }
 
 if ($define{'PERL_GLOBAL_STRUCT'}) {
-    readvar($perlvars_h, \%skip);
+    readvar('perlvars.h', \%skip);
     # This seems like the least ugly way to cope with the fact that PL_sh_path
     # is mentioned in perlvar.h and globvar.sym, and always exported.
     delete $skip{PL_sh_path};
@@ -542,7 +535,7 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 
 # functions from *.sym files
 
-my @syms = ($global_sym, $globvar_sym);
+my @syms = qw(globvar.sym);
 
 # Symbols that are the public face of the PerlIO layers implementation
 # These are in _addition to_ the public face of the abstraction
@@ -628,7 +621,7 @@ if ($ARGS{PLATFORM} eq 'netware') {
 if ($define{'USE_PERLIO'}) {
     # Export the symols that make up the PerlIO abstraction, regardless
     # of its implementation - read from a file
-    push @syms, $perlio_sym;
+    push @syms, 'perlio.sym';
 
     # This part is then dependent on how the abstraction is implemented
     if ($define{'USE_SFIO'}) {
@@ -739,7 +732,29 @@ if ($define{'USE_PERLIO'}) {
 # At this point all skip lists should be completed, as we are about to test
 # many symbols against them.
 
-for my $syms (@syms) {
+{
+    my %seen;
+    my ($embed) = setup_embed($ARGS{TARG_DIR});
+
+    foreach (@$embed) {
+	my ($flags, $retval, $func, @args) = @$_;
+	next unless $func;
+	if ($flags =~ /[AX]/ && $flags !~ /[xm]/ || $flags =~ /b/) {
+	    # public API, so export
+
+	    # If a function is defined twice, for example before and after
+	    # an #else, only export its name once. Important to do this test
+	    # within the block, as the *first* definition may have flags which
+	    # mean "don't export"
+	    next if $seen{$func}++;
+	    $func = "Perl_$func" if $flags =~ /[pbX]/;
+	    ++$export{$func} unless exists $skip{$func};
+	}
+    }
+}
+
+foreach (@syms) {
+    my $syms = $ARGS{TARG_DIR} . $_;
     open my $global, '<', $syms or die "failed to open $syms: $!\n";
     # Functions already have a Perl_ prefix
     # Variables need a PL_ prefix
@@ -754,18 +769,18 @@ for my $syms (@syms) {
 # variables
 
 if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) {
-    readvar($perlvars_h, \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
+    readvar('perlvars.h', \%export, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
     # XXX AIX seems to want the perlvars.h symbols, for some reason
     if ($ARGS{PLATFORM} eq 'aix' or $ARGS{PLATFORM} eq 'os2') {	# OS/2 needs PL_thr_key
-	readvar($perlvars_h, \%export);
+	readvar('perlvars.h', \%export);
     }
 }
 else {
     unless ($define{'PERL_GLOBAL_STRUCT'}) {
-	readvar($perlvars_h, \%export);
+	readvar('perlvars.h', \%export);
     }
     unless ($define{MULTIPLICITY}) {
-	readvar($intrpvar_h, \%export);
+	readvar('intrpvar.h', \%export);
     }
 }
 
@@ -950,9 +965,6 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
 			    win32_getchar
 			    win32_putchar
 		 ));
-    if ($ARGS{CCTYPE} eq "BORLAND") {
-	try_symbols('_matherr');
-    }
 }
 elsif ($ARGS{PLATFORM} eq 'vms') {
     try_symbols(qw(
@@ -1290,7 +1302,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
     print "LIBRARY $dll\n";
     # The DESCRIPTION module definition file statement is not supported
     # by VC7 onwards.
-    if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC|BORLAND)$/) {
+    if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) {
 	print "DESCRIPTION 'Perl interpreter'\n";
     }
     print "EXPORTS\n";
@@ -1334,7 +1346,6 @@ elsif ($ARGS{PLATFORM} eq 'netware') {
 
 foreach my $symbol (sort keys %export) {
     if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
-	$symbol = "_$symbol" if $ARGS{CCTYPE} eq 'BORLAND';
 	print "\t$symbol\n";
     }
     elsif ($ARGS{PLATFORM} eq 'os2') {