X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=makedef.pl;h=948066beb084b52427915d7b975f7ddb8ccc2e27;hb=ec38d36ccc38aad33e07cbbbf1e8816341de661d;hp=6a30fc6ee918ef0e00af26128ea98fa58fec3f40;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/makedef.pl b/makedef.pl
index 6a30fc6..948066b 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -1,8 +1,9 @@
 #
 # Create the export list for perl.
 #
-# Needed by WIN32 and OS/2 for creating perl.dll
-# and by AIX for creating libperl.a when -Dusershrplib is in effect.
+# Needed by WIN32 and OS/2 for creating perl.dll,
+# 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, thrdvar.h, config.h
 # On OS/2 reads miniperl.map as well
@@ -51,12 +52,12 @@ while (@ARGV) {
     $PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/);
 }
 
-my @PLATFORM = qw(aix win32 os2);
+my @PLATFORM = qw(aix win32 os2 MacOS);
 my %PLATFORM;
 @PLATFORM{@PLATFORM} = ();
 
 defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n";
-exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; 
+exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n";
 
 my $config_sh   = "config.sh";
 my $config_h    = "config.h";
@@ -68,7 +69,7 @@ my $pp_sym      = "pp.sym";
 my $globvar_sym = "globvar.sym";
 my $perlio_sym  = "perlio.sym";
 
-if ($PLATFORM eq 'aix') { 
+if ($PLATFORM eq 'aix') {
     # Nothing for now.
 }
 elsif ($PLATFORM eq 'win32') {
@@ -78,8 +79,14 @@ elsif ($PLATFORM eq 'win32') {
 	s!^!..\\!;
     }
 }
+elsif ($PLATFORM eq 'MacOS') {
+    foreach ($thrdvar_h, $intrpvar_h, $perlvars_h, $global_sym,
+		$pp_sym, $globvar_sym, $perlio_sym) {
+	s!^!::!;
+    }
+}
 
-unless ($PLATFORM eq 'win32') {
+unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS') {
     open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
     while (<CFG>) {
 	if (/^(?:ccflags|optimize)='(.+)'$/) {
@@ -118,7 +125,7 @@ $define{PERL_IMPLICIT_CONTEXT} ||=
 
 if ($define{PERL_CAPI}) {
     delete $define{PERL_OBJECT};
-    $define{MULTIPLICITY} = 1; 
+    $define{MULTIPLICITY} = 1;
     $define{PERL_IMPLICIT_CONTEXT} = 1;
     $define{PERL_IMPLICIT_SYS}     = 1;
 }
@@ -270,6 +277,8 @@ elsif ($PLATFORM eq 'os2') {
 		    my_tmpfile
 		    my_tmpnam
 		    my_flock
+		    my_rmdir
+		    my_mkdir
 		    malloc_mutex
 		    threads_mutex
 		    nthreads
@@ -300,6 +309,35 @@ elsif ($PLATFORM eq 'os2') {
 		    Perl_hab_GET
 		    )]);
 }
+elsif ($PLATFORM eq 'MacOS') {
+    skip_symbols [qw(
+		    Perl_GetVars
+		    PL_cryptseen
+		    PL_cshlen
+		    PL_cshname
+		    PL_statusvalue_vms
+		    PL_sys_intern
+		    PL_opsave
+		    PL_timesbuf
+		    Perl_dump_fds
+		    Perl_my_bcopy
+		    Perl_my_bzero
+		    Perl_my_chsize
+		    Perl_my_htonl
+		    Perl_my_memcmp
+		    Perl_my_memset
+		    Perl_my_ntohl
+		    Perl_my_swap
+		    Perl_safexcalloc
+		    Perl_safexfree
+		    Perl_safexmalloc
+		    Perl_safexrealloc
+		    Perl_unlnk
+		    Perl_sys_intern_clear
+		    Perl_sys_intern_init
+		    )];
+}
+
 
 unless ($define{'DEBUGGING'}) {
     skip_symbols [qw(
@@ -353,6 +391,8 @@ if ($define{'MYMALLOC'}) {
 		    Perl_mfree
 		    Perl_realloc
 		    Perl_calloc
+		    Perl_strdup
+		    Perl_putenv
 		    )];
     if ($define{'USE_5005THREADS'} || $define{'USE_ITHREADS'}) {
 	emit_symbols [qw(
@@ -429,8 +469,12 @@ unless ($define{'USE_ITHREADS'}) {
 		    Perl_re_dup
 		    Perl_sv_dup
 		    Perl_sys_intern_dup
+		    Perl_ptr_table_clear
 		    Perl_ptr_table_fetch
+		    Perl_ptr_table_free
 		    Perl_ptr_table_new
+		    Perl_ptr_table_clear
+		    Perl_ptr_table_free
 		    Perl_ptr_table_split
 		    Perl_ptr_table_store
 		    perl_clone
@@ -476,8 +520,8 @@ sub readvar {
 	# 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+)/);
-    } 
-    close(VARS); 
+    }
+    close(VARS);
     return \@syms;
 }
 
@@ -497,8 +541,89 @@ if ($define{'PERL_GLOBAL_STRUCT'}) {
 
 my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
 
+my @layer_syms = qw(
+			 PerlIOBase_clearerr
+			 PerlIOBase_close
+			 PerlIOBase_eof
+			 PerlIOBase_error
+			 PerlIOBase_fileno
+			 PerlIOBase_setlinebuf
+			 PerlIOBase_pushed
+			 PerlIOBase_read
+		         PerlIOBase_unread
+			 PerlIOBuf_bufsiz
+			 PerlIOBuf_fill
+			 PerlIOBuf_flush
+			 PerlIOBuf_get_cnt
+			 PerlIOBuf_get_ptr
+			 PerlIOBuf_open
+			 PerlIOBuf_pushed
+			 PerlIOBuf_read
+			 PerlIOBuf_seek
+			 PerlIOBuf_set_ptrcnt
+			 PerlIOBuf_tell
+			 PerlIOBuf_unread
+			 PerlIOBuf_write
+			 PerlIO_define_layer
+			 PerlIO_arg_fetch
+			 PerlIO_pending
+			 PerlIO_allocate
+			 PerlIO_push
+			 PerlIO_unread
+);
+
 if ($define{'USE_PERLIO'}) {
-     push @syms, $perlio_sym;
+    push @syms, $perlio_sym;
+    if ($define{'USE_SFIO'}) {
+	skip_symbols \@layer_syms;
+	# SFIO defines most of the PerlIO routines as macros
+	skip_symbols [qw(
+			 PerlIO_canset_cnt
+			 PerlIO_clearerr
+			 PerlIO_close
+			 PerlIO_eof
+			 PerlIO_error
+			 PerlIO_exportFILE
+			 PerlIO_fast_gets
+			 PerlIO_fdopen
+			 PerlIO_fileno
+			 PerlIO_findFILE
+			 PerlIO_flush
+			 PerlIO_get_base
+			 PerlIO_get_bufsiz
+			 PerlIO_get_cnt
+			 PerlIO_get_ptr
+			 PerlIO_getc
+			 PerlIO_getname
+			 PerlIO_has_base
+			 PerlIO_has_cntptr
+			 PerlIO_importFILE
+			 PerlIO_open
+			 PerlIO_printf
+			 PerlIO_putc
+			 PerlIO_puts
+			 PerlIO_read
+			 PerlIO_releaseFILE
+			 PerlIO_reopen
+			 PerlIO_rewind
+			 PerlIO_seek
+			 PerlIO_set_cnt
+			 PerlIO_set_ptrcnt
+			 PerlIO_setlinebuf
+			 PerlIO_sprintf
+			 PerlIO_stderr
+			 PerlIO_stdin
+			 PerlIO_stdout
+			 PerlIO_stdoutf
+			 PerlIO_tell
+			 PerlIO_ungetc
+			 PerlIO_vprintf
+			 PerlIO_write
+			 )];
+    }
+} else {
+	# Skip the PerlIO New Generation symbols.
+	skip_symbols \@layer_syms;
 }
 
 for my $syms (@syms) {
@@ -532,15 +657,15 @@ else {
     unless ($define{'PERL_GLOBAL_STRUCT'}) {
 	my $glob = readvar($perlvars_h);
 	emit_symbols $glob;
-    } 
+    }
     unless ($define{'MULTIPLICITY'}) {
 	my $glob = readvar($intrpvar_h);
 	emit_symbols $glob;
-    } 
+    }
     unless ($define{'MULTIPLICITY'} || $define{'USE_5005THREADS'}) {
 	my $glob = readvar($thrdvar_h);
 	emit_symbols $glob;
-    } 
+    }
 }
 
 sub try_symbol {
@@ -725,6 +850,15 @@ elsif ($PLATFORM eq 'os2') {
 		    keys %export;
     delete $export{$_} foreach @missing;
 }
+elsif ($PLATFORM eq 'MacOS') {
+    open MACSYMS, 'macperl.sym' or die 'Cannot read macperl.sym';
+
+    while (<MACSYMS>) {
+	try_symbol($_);
+    }
+
+    close MACSYMS;
+}
 
 # Now all symbols should be defined because
 # next we are going to output them.
@@ -735,7 +869,7 @@ foreach my $symbol (sort keys %export) {
 
 sub emit_symbol {
     my $symbol = shift;
-    chomp($symbol); 
+    chomp($symbol);
     $export{$symbol} = 1;
 }
 
@@ -771,7 +905,7 @@ sub output_symbol {
     elsif ($PLATFORM eq 'os2') {
 	print qq(    "$symbol"\n);
     }
-    elsif ($PLATFORM eq 'aix') {
+    elsif ($PLATFORM eq 'aix' || $PLATFORM eq 'MacOS') {
 	print "$symbol\n";
     }
 }
@@ -793,8 +927,11 @@ PerlIOBuf_set_ptrcnt
 PerlIOBuf_get_cnt
 PerlIOBuf_get_ptr
 PerlIOBuf_bufsiz
-PerlIOBuf_setlinebuf
 PerlIOBase_clearerr
+PerlIOBase_setlinebuf
+PerlIOBase_pushed
+PerlIOBase_read
+PerlIOBase_unread
 PerlIOBase_error
 PerlIOBase_eof
 PerlIOBuf_tell
@@ -802,9 +939,7 @@ PerlIOBuf_seek
 PerlIOBuf_write
 PerlIOBuf_unread
 PerlIOBuf_read
-PerlIOBuf_reopen
 PerlIOBuf_open
-PerlIOBuf_fdopen
 PerlIOBase_fileno
 PerlIOBuf_pushed
 PerlIOBuf_fill
@@ -814,6 +949,8 @@ PerlIO_define_layer
 PerlIO_pending
 PerlIO_unread
 PerlIO_push
+PerlIO_allocate
+PerlIO_arg_fetch
 PerlIO_apply_layers
 perlsio_binmode
 PerlIO_binmode