my $PLATFORM;
my $CCTYPE;
-my %bincompat5005 =
- (
- Perl_call_atexit => "perl_atexit",
- Perl_eval_sv => "perl_eval_sv",
- Perl_eval_pv => "perl_eval_pv",
- Perl_call_argv => "perl_call_argv",
- Perl_call_method => "perl_call_method",
- Perl_call_pv => "perl_call_pv",
- Perl_call_sv => "perl_call_sv",
- Perl_get_av => "perl_get_av",
- Perl_get_cv => "perl_get_cv",
- Perl_get_hv => "perl_get_hv",
- Perl_get_sv => "perl_get_sv",
- Perl_init_i18nl10n => "perl_init_i18nl10n",
- Perl_init_i18nl14n => "perl_init_i18nl14n",
- Perl_new_collate => "perl_new_collate",
- Perl_new_ctype => "perl_new_ctype",
- Perl_new_numeric => "perl_new_numeric",
- Perl_require_pv => "perl_require_pv",
- Perl_safesyscalloc => "Perl_safecalloc",
- Perl_safesysfree => "Perl_safefree",
- Perl_safesysmalloc => "Perl_safemalloc",
- Perl_safesysrealloc => "Perl_saferealloc",
- Perl_set_numeric_local => "perl_set_numeric_local",
- Perl_set_numeric_standard => "perl_set_numeric_standard",
- Perl_malloc => "malloc",
- Perl_mfree => "free",
- Perl_realloc => "realloc",
- Perl_calloc => "calloc",
- );
-
-my $bincompat5005 = join("|", keys %bincompat5005);
-
while (@ARGV) {
my $flag = shift;
$define{$1} = 1 if ($flag =~ /^-D(\w+)$/);
$define{$1} = $2 if ($flag =~ /^-D(\w+)=(.+)$/);
$CCTYPE = $1 if ($flag =~ /^CCTYPE=(\w+)$/);
$PLATFORM = $1 if ($flag =~ /^PLATFORM=(\w+)$/);
- if ($PLATFORM eq 'netware') {
- $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/);
- }
+ if ($PLATFORM eq 'netware') {
+ $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/);
+ }
}
-my @PLATFORM = qw(aix win32 os2 MacOS netware);
+my @PLATFORM = qw(aix win32 wince os2 MacOS netware);
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";
+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";
if ($PLATFORM eq 'aix') {
# Nothing for now.
}
-elsif ($PLATFORM eq 'win32' || $PLATFORM eq 'netware') {
+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) {
}
}
-unless ($PLATFORM eq 'win32' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware') {
+unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'MacOS' || $PLATFORM eq 'netware') {
open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n";
while (<CFG>) {
if (/^(?:ccflags|optimize)='(.+)'$/) {
$define{$1} = 1 while /-D(\w+)/g;
}
if ($PLATFORM eq 'os2') {
- $CONFIG_ARGS = $1 if /^(?:config_args)='(.+)'$/;
- $ARCHNAME = $1 if /^(?:archname)='(.+)'$/;
+ $CONFIG_ARGS = $1 if /^config_args='(.+)'$/;
+ $ARCHNAME = $1 if /^archname='(.+)'$/;
+ $PATCHLEVEL = $1 if /^perl_patchlevel='(.+)'$/;
}
}
close(CFG);
# perl.h logic duplication begins
+if ($define{PERL_IMPLICIT_SYS}) {
+ $define{PL_OP_SLAB_ALLOC} = 1;
+}
+
if ($define{USE_ITHREADS}) {
- if (!$define{MULTIPLICITY} && !$define{PERL_OBJECT}) {
+ if (!$define{MULTIPLICITY}) {
$define{MULTIPLICITY} = 1;
}
}
$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;
+if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') {
+ $define{USE_REENTRANT_API} = 1;
}
# perl.h logic duplication ends
-if ($PLATFORM eq 'win32') {
+my $sym_ord = 0;
+
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
warn join(' ',keys %define)."\n";
- print "LIBRARY Perl57\n";
+ ($dll = ($define{PERL_DLL} || "perl59")) =~ s/\.dll$//i;
+ print "LIBRARY $dll\n";
print "DESCRIPTION 'Perl interpreter'\n";
print "EXPORTS\n";
if ($define{PERL_IMPLICIT_SYS}) {
output_symbol("perl_get_host_info");
output_symbol("perl_alloc_override");
- output_symbol("perl_clone_host");
+ }
+ if ($define{USE_ITHREADS} and $define{PERL_IMPLICIT_SYS}) {
+ output_symbol("perl_clone_host");
}
}
elsif ($PLATFORM eq 'os2') {
+ if (open my $fh, '<', 'perl5.def') {
+ while (<$fh>) {
+ last if /^\s*EXPORTS\b/;
+ }
+ while (<$fh>) {
+ $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*$/;
+ }
+ $sym_ord < $_ and $sym_ord = $_ for values %ordinal; # Take the max
+ }
($v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/;
$v .= '-thread' if $ARCHNAME =~ /-thread/;
($dll = $define{PERL_DLL}) =~ s/\.dll$//i;
+ $v .= "\@$PATCHLEVEL" if $PATCHLEVEL;
$d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $CONFIG_ARGS'";
$d = substr($d, 0, 249) . "...'" if length $d > 253;
print <<"---EOP---";
}
elsif ($PLATFORM eq 'netware') {
if ($FILETYPE eq 'def') {
- print "LIBRARY Perl57\n";
+ print "LIBRARY perl59\n";
print "DESCRIPTION 'Perl interpreter for NetWare'\n";
print "EXPORTS\n";
}
if ($define{PERL_IMPLICIT_SYS}) {
- output_symbol("perl_get_host_info");
- output_symbol("perl_alloc_override");
- output_symbol("perl_clone_host");
+ output_symbol("perl_get_host_info");
+ output_symbol("perl_alloc_override");
+ output_symbol("perl_clone_host");
}
}
foreach my $symbol (@$list) {
my $skipsym = $symbol;
# XXX hack
- if ($define{PERL_OBJECT} || $define{MULTIPLICITY}) {
+ if ($define{MULTIPLICITY}) {
$skipsym =~ s/^Perl_[GIT](\w+)_ptr$/PL_$1/;
}
emit_symbol($symbol) unless exists $skip{$skipsym};
Perl_my_popen
)];
}
+else {
+ skip_symbols [qw(
+ Perl_do_spawn
+ Perl_do_spawn_nowait
+ Perl_do_aspawn
+ )];
+}
+if ($PLATFORM eq 'wince') {
+ skip_symbols [qw(
+ PL_statusvalue_vms
+ PL_archpat_auto
+ PL_cryptseen
+ PL_DBcv
+ PL_generation
+ PL_lastgotoprobe
+ PL_linestart
+ PL_modcount
+ PL_pending_ident
+ PL_sortcxix
+ PL_sublex_info
+ PL_timesbuf
+ PL_collation_ix
+ PL_collation_name
+ PL_collation_standard
+ PL_collxfrm_base
+ PL_collxfrm_mult
+ PL_numeric_compat1
+ PL_numeric_local
+ PL_numeric_name
+ PL_numeric_radix_sv
+ PL_numeric_standard
+ PL_vtbl_collxfrm
+ Perl_sv_collxfrm
+ setgid
+ setuid
+ win32_async_check
+ win32_free_childdir
+ win32_free_childenv
+ win32_get_childdir
+ win32_get_childenv
+ win32_spawnvp
+ main
+ Perl_ErrorNo
+ Perl_GetVars
+ Perl_do_exec3
+ Perl_do_ipcctl
+ Perl_do_ipcget
+ Perl_do_msgrcv
+ Perl_do_msgsnd
+ Perl_do_semop
+ Perl_do_shmio
+ Perl_dump_fds
+ Perl_init_thread_intern
+ Perl_my_bzero
+ Perl_my_bcopy
+ Perl_my_htonl
+ Perl_my_ntohl
+ Perl_my_swap
+ Perl_my_chsize
+ Perl_same_dirent
+ Perl_setenv_getix
+ Perl_unlnk
+ Perl_watch
+ Perl_safexcalloc
+ Perl_safexmalloc
+ Perl_safexfree
+ Perl_safexrealloc
+ Perl_my_memcmp
+ Perl_my_memset
+ PL_cshlen
+ PL_cshname
+ PL_opsave
+ Perl_do_exec
+ Perl_getenv_len
+ Perl_my_pclose
+ Perl_my_popen
+ )];
+}
elsif ($PLATFORM eq 'aix') {
skip_symbols([qw(
Perl_dump_fds
Perl_hab_GET
loadByOrdinal
pExtFCN
+ os2error
+ ResetWinError
+ CroakWinError
)]);
}
elsif ($PLATFORM eq 'MacOS') {
Perl_getenv_len
Perl_my_pclose
Perl_my_popen
+ Perl_sys_intern_init
+ Perl_sys_intern_dup
+ Perl_sys_intern_clear
+ Perl_my_bcopy
+ Perl_PerlIO_write
+ Perl_PerlIO_unread
+ Perl_PerlIO_tell
+ Perl_PerlIO_stdout
+ Perl_PerlIO_stdin
+ Perl_PerlIO_stderr
+ Perl_PerlIO_setlinebuf
+ Perl_PerlIO_set_ptrcnt
+ Perl_PerlIO_set_cnt
+ Perl_PerlIO_seek
+ Perl_PerlIO_read
+ Perl_PerlIO_get_ptr
+ Perl_PerlIO_get_cnt
+ Perl_PerlIO_get_bufsiz
+ Perl_PerlIO_get_base
+ Perl_PerlIO_flush
+ Perl_PerlIO_fill
+ Perl_PerlIO_fileno
+ Perl_PerlIO_error
+ Perl_PerlIO_eof
+ Perl_PerlIO_close
+ Perl_PerlIO_clearerr
+ PerlIO_perlio
)];
}
Perl_debprofdump
Perl_debstack
Perl_debstackptrs
- Perl_runops_debug
Perl_sv_peek
PL_block_type
PL_watchaddr
PL_op_mutex
PL_regex_pad
PL_regex_padav
+ PL_sharedsv_space
+ PL_sharedsv_space_mutex
Perl_dirp_dup
Perl_cx_dup
Perl_si_dup
Perl_ptr_table_store
perl_clone
perl_clone_using
+ Perl_sharedsv_find
+ Perl_sharedsv_init
+ Perl_sharedsv_lock
+ Perl_sharedsv_new
+ Perl_sharedsv_thrcnt_dec
+ Perl_sharedsv_thrcnt_inc
+ Perl_sharedsv_unlock
)];
}
skip_symbols [qw(PL_curthr)];
}
+unless ($define{'PL_OP_SLAB_ALLOC'}) {
+ skip_symbols [qw(
+ PL_OpPtr
+ PL_OpSlab
+ PL_OpSpace
+ )];
+}
+
+unless ($define{'THREADS_HAVE_PIDS'}) {
+ skip_symbols [qw(PL_ppid)];
+}
+
sub readvar {
my $file = shift;
my $proc = shift || sub { "PL_$_[2]" };
my @syms = ($global_sym, $globvar_sym); # $pp_sym is not part of the API
+# Symbols that are the public face of the PerlIO layers implementation
+# These are in _addition to_ the public face of the abstraction
+# and need to be exported to allow XS modules to implement layers
my @layer_syms = qw(
PerlIOBase_clearerr
PerlIOBase_close
+ PerlIOBase_dup
PerlIOBase_eof
PerlIOBase_error
PerlIOBase_fileno
- PerlIOBase_setlinebuf
PerlIOBase_pushed
+ PerlIOBase_binmode
+ PerlIOBase_popped
PerlIOBase_read
- PerlIOBase_unread
+ PerlIOBase_setlinebuf
+ PerlIOBase_unread
PerlIOBuf_bufsiz
PerlIOBuf_fill
PerlIOBuf_flush
+ PerlIOBuf_get_base
PerlIOBuf_get_cnt
PerlIOBuf_get_ptr
PerlIOBuf_open
PerlIOBuf_pushed
+ PerlIOBuf_popped
PerlIOBuf_read
PerlIOBuf_seek
PerlIOBuf_set_ptrcnt
PerlIOBuf_tell
PerlIOBuf_unread
PerlIOBuf_write
- PerlIO_define_layer
+ PerlIO_debug
+ PerlIO_allocate
+ PerlIO_apply_layera
+ PerlIO_apply_layers
PerlIO_arg_fetch
+ PerlIO_define_layer
+ PerlIO_modestr
+ PerlIO_parse_layers
+ PerlIO_layer_fetch
+ PerlIO_list_free
+ PerlIO_apply_layera
PerlIO_pending
- PerlIO_allocate
PerlIO_push
- PerlIO_unread
+ PerlIO_pop
+ PerlIO_sv_dup
+ PerlIO_perlio
+
+Perl_PerlIO_clearerr
+Perl_PerlIO_close
+Perl_PerlIO_eof
+Perl_PerlIO_error
+Perl_PerlIO_fileno
+Perl_PerlIO_fill
+Perl_PerlIO_flush
+Perl_PerlIO_get_base
+Perl_PerlIO_get_bufsiz
+Perl_PerlIO_get_cnt
+Perl_PerlIO_get_ptr
+Perl_PerlIO_read
+Perl_PerlIO_seek
+Perl_PerlIO_set_cnt
+Perl_PerlIO_set_ptrcnt
+Perl_PerlIO_setlinebuf
+Perl_PerlIO_stderr
+Perl_PerlIO_stdin
+Perl_PerlIO_stdout
+Perl_PerlIO_tell
+Perl_PerlIO_unread
+Perl_PerlIO_write
+
);
+if ($PLATFORM eq 'netware') {
+ push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio');
+}
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;
+
+ # This part is then dependent on how the abstraction is implemented
if ($define{'USE_SFIO'}) {
+ # Old legacy non-stdio "PerlIO"
skip_symbols \@layer_syms;
# 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
+ # And emit them
skip_symbols [qw(
PerlIO_canset_cnt
PerlIO_clearerr
PerlIO_ungetc
PerlIO_vprintf
PerlIO_write
+ PerlIO_perlio
+ Perl_PerlIO_clearerr
+ Perl_PerlIO_close
+ Perl_PerlIO_eof
+ Perl_PerlIO_error
+ Perl_PerlIO_fileno
+ Perl_PerlIO_fill
+ Perl_PerlIO_flush
+ Perl_PerlIO_get_base
+ Perl_PerlIO_get_bufsiz
+ Perl_PerlIO_get_cnt
+ Perl_PerlIO_get_ptr
+ Perl_PerlIO_read
+ Perl_PerlIO_seek
+ Perl_PerlIO_set_cnt
+ Perl_PerlIO_set_ptrcnt
+ Perl_PerlIO_setlinebuf
+ Perl_PerlIO_stderr
+ Perl_PerlIO_stdin
+ Perl_PerlIO_stdout
+ Perl_PerlIO_tell
+ Perl_PerlIO_unread
+ Perl_PerlIO_write
+ PL_def_layerlist
+ PL_known_layers
+ PL_perlio
)];
}
+ else {
+ # PerlIO with layers - export implementation
+ emit_symbols \@layer_syms;
+ }
} else {
- # Skip the PerlIO New Generation symbols.
+ # -Uuseperlio
+ # Skip the PerlIO layer symbols - although
+ # nothing should have exported them any way
skip_symbols \@layer_syms;
+ skip_symbols [qw(PL_def_layerlist PL_known_layers PL_perlio)];
+
+ # Also do NOT add abstraction symbols from $perlio_sym
+ # abstraction is done as #define to stdio
+ # Remaining remnants that _may_ be functions
+ # are handled in <DATA>
}
for my $syms (@syms) {
# variables
-if ($define{'PERL_OBJECT'} || $define{'MULTIPLICITY'}) {
+if ($define{'MULTIPLICITY'}) {
for my $f ($perlvars_h, $intrpvar_h, $thrdvar_h) {
my $glob = readvar($f, sub { "Perl_" . $_[1] . $_[2] . "_ptr" });
emit_symbols $glob;
try_symbol($_);
}
-if ($PLATFORM eq 'win32') {
+if ($PLATFORM =~ /^win(?:32|ce)$/) {
foreach my $symbol (qw(
setuid
setgid
Perl_thread_create
Perl_win32_init
RunPerl
+ win32_async_check
win32_errno
win32_environ
win32_abort
win32_link
win32_unlink
win32_utime
+ win32_gettimeofday
win32_uname
win32_wait
win32_waitpid
win32_getpid
win32_crypt
win32_dynaload
-
+ win32_get_childenv
+ win32_free_childenv
+ win32_clearenv
+ win32_get_childdir
+ win32_free_childdir
win32_stdin
win32_stdout
win32_stderr
/^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach <MAP>;
close MAP or die 'Cannot close miniperl.map';
- @missing = grep { !exists $mapped{$_} and !exists $bincompat5005{$_} }
+ @missing = grep { !exists $mapped{$_} }
keys %export;
+ @missing = grep { !exists $exportperlmalloc{$_} } @missing;
delete $export{$_} foreach @missing;
}
elsif ($PLATFORM eq 'MacOS') {
nw_setnetent
nw_setprotoent
nw_setservent
+ nw_setsockopt
+ nw_inet_ntoa
nw_shutdown
nw_crypt
nw_execvp
fnInsertHashListAddrs
fnGetHashListAddrs
Perl_deb
+ Perl_sv_setsv
+ Perl_sv_catsv
+ Perl_sv_catpvn
+ Perl_sv_2pv
+ nw_freeenviron
+ Remove_Thread_Ctx
))
{
try_symbol($symbol);
output_symbol($symbol);
}
-if ($PLATFORM eq 'netware') {
- # This may not be the right way to do. This is to make sure
- # that the last symbol will not contain a comma else
- # Watcom linker cribs
- print "\tdummy\n";
+if ($PLATFORM eq 'os2') {
+ print "; LAST_ORDINAL=$sym_ord\n";
}
sub emit_symbol {
$export{$symbol} = 1;
}
-my $sym_ord = 0;
-
sub output_symbol {
my $symbol = shift;
- $symbol = $bincompat5005{$symbol}
- if $define{PERL_BINCOMPAT_5005} and $symbol =~ /^($bincompat5005)$/;
- if ($PLATFORM eq 'win32') {
+ if ($PLATFORM =~ /^win(?:32|ce)$/) {
$symbol = "_$symbol" if $CCTYPE eq 'BORLAND';
print "\t$symbol\n";
# XXX: binary compatibility between compilers is an exercise
# }
}
elsif ($PLATFORM eq 'os2') {
- printf qq( %-31s \@%s\n), qq("$symbol"), ++$sym_ord;
+ 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";
1;
__DATA__
# extra globals not included above.
+Perl_cxinc
perl_alloc
perl_alloc_using
perl_clone
perl_free
perl_parse
perl_run
-PerlIO_define_layer
-PerlIOBuf_set_ptrcnt
-PerlIOBuf_get_cnt
-PerlIOBuf_get_ptr
-PerlIOBuf_bufsiz
-PerlIOBase_clearerr
-PerlIOBase_setlinebuf
-PerlIOBase_pushed
-PerlIOBase_read
-PerlIOBase_unread
-PerlIOBase_error
-PerlIOBase_eof
-PerlIOBuf_tell
-PerlIOBuf_seek
-PerlIOBuf_write
-PerlIOBuf_unread
-PerlIOBuf_read
-PerlIOBuf_open
-PerlIOBase_fileno
-PerlIOBuf_pushed
-PerlIOBuf_fill
-PerlIOBuf_flush
-PerlIOBase_close
-PerlIO_define_layer
-PerlIO_pending
-PerlIO_unread
-PerlIO_push
-PerlIO_allocate
-PerlIO_arg_fetch
-PerlIO_apply_layers
-perlsio_binmode
+# Oddities from PerlIO
PerlIO_binmode
+PerlIO_getpos
PerlIO_init
-PerlIO_tmpfile
PerlIO_setpos
-PerlIO_getpos
-PerlIO_vsprintf
PerlIO_sprintf
+PerlIO_sv_dup
+PerlIO_tmpfile
+PerlIO_vsprintf
+perlsio_binmode