X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/9661ac31cea34697b5b3481463c4f97203d2d572..69374fe705978962b85217f3eb828a93f836fd8d:/makedef.pl diff --git a/makedef.pl b/makedef.pl index f84c009..5dc7bdf 100644 --- a/makedef.pl +++ b/makedef.pl @@ -3,20 +3,21 @@ # 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, +# and by AIX for creating libperl.a when -Duseshrplib is in effect, # and by VMS for creating perlshr.exe. # # Reads from information stored in # +# %Config::Config (ie config.sh) # config.h -# config.sh -# 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. # @@ -31,40 +32,51 @@ # perl.imp NetWare # makedef.lis VMS -BEGIN { unshift @INC, "lib" } -use Config; -use strict; +my $fold; +my %ARGS; +my %define; -use vars qw($PLATFORM $CCTYPE $FILETYPE $TARG_DIR); +BEGIN { + BEGIN { unshift @INC, "lib" } + use Config; + use strict; -$CCTYPE = 'MSVC'; -$TARG_DIR = ''; + %ARGS = (CCTYPE => 'MSVC', TARG_DIR => ''); -my %define; + sub process_cc_flags { + foreach (map {split /\s+/, $_} @_) { + $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/; + } + } -while (@ARGV) { - my $flag = shift; - if ($flag =~ s/^CC_FLAGS=/ /) { - for my $fflag ($flag =~ /(?:^|\s)-D(\S+)/g) { - $fflag .= '=1' unless $fflag =~ /^(\w+)=/; - $define{$1} = $2 if $fflag =~ /^(\w+)=(.+)$/; + while (@ARGV) { + my $flag = shift; + if ($flag =~ /^(?:CC_FLAGS=)?(-D\w.*)/) { + process_cc_flags($1); + } elsif ($flag =~ /^(CCTYPE|FILETYPE|PLATFORM|TARG_DIR)=(.+)$/) { + $ARGS{$1} = $2; + } elsif ($flag eq '--sort-fold') { + ++$fold; } - next; } - $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+)$/); - $FILETYPE = $1 if ($flag =~ /^FILETYPE=(\w+)$/); - $TARG_DIR = $1 if $flag =~ /^TARG_DIR=(.+)$/; + my @PLATFORM = qw(aix win32 wince os2 netware vms test); + my %PLATFORM; + @PLATFORM{@PLATFORM} = (); + + die "PLATFORM undefined, must be one of: @PLATFORM\n" + unless defined $ARGS{PLATFORM}; + die "PLATFORM must be one of: @PLATFORM\n" + unless exists $PLATFORM{$ARGS{PLATFORM}}; } +use constant PLATFORM => $ARGS{PLATFORM}; -my @PLATFORM = qw(aix win32 wince os2 netware vms); -my %PLATFORM; -@PLATFORM{@PLATFORM} = (); +require "./$ARGS{TARG_DIR}regen/embed_lib.pl"; -defined $PLATFORM || die "PLATFORM undefined, must be one of: @PLATFORM\n"; -exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; +# Is the following guard strictly necessary? Added during refactoring +# to keep the same behaviour when merging other code into here. +process_cc_flags(@Config{qw(ccflags optimize)}) + if $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'wince' + && $ARGS{PLATFORM} ne 'netware'; # Add the compile-time options that miniperl was built with to %define. # On Win32 these are not the same options as perl itself will be built @@ -75,9 +87,12 @@ exists $PLATFORM{$PLATFORM} || die "PLATFORM must be one of: @PLATFORM\n"; # the user might have chosen to disable because the canned configs are # minimal configs that don't include any of those options. -my @options = sort(Config::bincompat_options(), Config::non_bincompat_options()); -print STDERR "Options: (@options)\n"; -$define{$_} = 1 foreach @options; +#don't use the host Perl's -V defines for the WinCE Perl +if($ARGS{PLATFORM} ne 'wince') { + my @options = sort(Config::bincompat_options(), Config::non_bincompat_options()); + print STDERR "Options: (@options)\n" unless $ARGS{PLATFORM} eq 'test'; + $define{$_} = 1 foreach @options; +} my %exportperlmalloc = ( @@ -87,54 +102,19 @@ my %exportperlmalloc = Perl_calloc => "calloc", ); -my $exportperlmalloc = $PLATFORM eq 'os2'; - -my $config_sh = "config.sh"; -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"; -my $static_ext = ""; - -s/^/$TARG_DIR/ foreach($intrpvar_h, $perlvars_h, $global_sym, $globvar_sym, - $perlio_sym, $config_sh); - -unless ($PLATFORM eq 'win32' || $PLATFORM eq 'wince' || $PLATFORM eq 'netware') { - open(CFG,$config_sh) || die "Cannot open $config_sh: $!\n"; - while () { - if (/^(?:ccflags|optimize)='(.+)'$/) { - $_ = $1; - $define{$1} = 1 while /-D(\w+)/g; - } - $define{$1} = $2 - if /^(config_args|archname|perl_patchlevel)='(.+)'$/; - } - close(CFG); -} -if ($PLATFORM eq 'win32' || $PLATFORM eq 'wince') { - open(CFG, '<', $config_sh) || die "Cannot open $config_sh: $!\n"; - if ((join '', ) =~ /^static_ext='(.*)'$/m) { - $static_ext = $1; - } - close(CFG); -} +my $exportperlmalloc = $ARGS{PLATFORM} eq 'os2'; -open(CFG,$config_h) || die "Cannot open $config_h: $!\n"; +my $config_h = 'config.h'; +open(CFG, '<', $config_h) || die "Cannot open $config_h: $!\n"; while () { $define{$1} = 1 if /^\s*\#\s*define\s+(MYMALLOC|MULTIPLICITY - |SPRINTF_RETURNS_STRLEN + |KILL_BY_SIGPRC |(?:PERL|USE|HAS)_\w+)\b/x; } 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{MULTIPLICITY} = 1; @@ -145,18 +125,19 @@ $define{PERL_IMPLICIT_CONTEXT} ||= $define{USE_ITHREADS} || $define{MULTIPLICITY} ; -if ($define{USE_ITHREADS} && $PLATFORM ne 'win32' && $^O ne 'darwin') { +if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') { $define{USE_REENTRANT_API} = 1; } # perl.h logic duplication ends -print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n"; +print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n" + unless $ARGS{PLATFORM} eq 'test'; my $sym_ord = 0; my %ordinal; -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { if (open my $fh, '<', 'perl5.def') { while (<$fh>) { last if /^\s*EXPORTS\b/; @@ -186,13 +167,15 @@ 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>) { # All symbols have a Perl_ prefix because that's what embed.h sticks # in front of them. The A?I?S?C? is strictly speaking wrong. - next unless /\bPERLVAR(A?I?S?C?)\(([IGT])(\w+)/; + next unless /\bPERLVAR(A?I?S?C?)\(([IGT]),\s*(\w+)/; my $var = "PL_$3"; my $symbol = $proc ? &$proc($1,$2,$3) : $var; @@ -200,7 +183,7 @@ sub readvar { } } -if ($PLATFORM ne 'os2') { +if ($ARGS{PLATFORM} ne 'os2') { ++$skip{$_} foreach qw( PL_cryptseen PL_opsave @@ -215,31 +198,34 @@ if ($PLATFORM ne 'os2') { Perl_my_ntohl Perl_my_swap ); - if ($PLATFORM eq 'vms') { + if ($ARGS{PLATFORM} eq 'vms') { ++$skip{PL_statusvalue_posix}; + # This is a wrapper if we have symlink, not a replacement + # if we don't. + ++$skip{Perl_my_symlink} unless $Config{d_symlink}; } else { ++$skip{PL_statusvalue_vms}; - if ($PLATFORM ne 'aix') { + ++$skip{PL_perllib_sep}; + if ($ARGS{PLATFORM} ne 'aix') { ++$skip{$_} foreach qw( PL_DBcv PL_generation PL_lastgotoprobe PL_modcount - PL_timesbuf main ); } } } -if ($PLATFORM ne 'vms') { +if ($ARGS{PLATFORM} ne 'vms') { # VMS does its own thing for these symbols. ++$skip{$_} foreach qw( PL_sig_handlers_initted PL_sig_ignoring PL_sig_defaulting ); - if ($PLATFORM ne 'win32') { + if ($ARGS{PLATFORM} ne 'win32') { ++$skip{$_} foreach qw( Perl_do_spawn Perl_do_spawn_nowait @@ -248,6 +234,12 @@ if ($PLATFORM ne 'vms') { } } +if ($ARGS{PLATFORM} ne 'win32') { + ++$skip{$_} foreach qw( + Perl_my_setlocale + ); +} + unless ($define{UNLINK_ALL_VERSIONS}) { ++$skip{Perl_unlnk}; } @@ -260,8 +252,9 @@ unless ($define{'DEBUGGING'}) { Perl_debstackptrs Perl_pad_sv Perl_pad_setsv + Perl__setlocale_debug_string + Perl_set_padlist Perl_hv_assert - PL_block_type PL_watchaddr PL_watchok PL_watch_pvx @@ -292,10 +285,14 @@ else { ); } -unless ($define{'PERL_OLD_COPY_ON_WRITE'}) { +if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) { ++$skip{Perl_sv_setsv_cow}; } +unless ($define{PERL_SAWAMPERSAND}) { + ++$skip{PL_sawampersand}; +} + unless ($define{'USE_REENTRANT_API'}) { ++$skip{PL_reentrant_buffer}; } @@ -361,13 +358,21 @@ unless ($define{'USE_ITHREADS'}) { unless ($define{'USE_ITHREADS'}) { ++$skip{$_} foreach qw( + PL_keyword_plugin_mutex + PL_check_mutex PL_op_mutex PL_regex_pad PL_regex_padav PL_dollarzero_mutex PL_hints_mutex + PL_locale_mutex PL_my_ctx_mutex PL_perlio_mutex + PL_stashpad + PL_stashpadix + PL_stashpadmax + Perl_alloccopstash + Perl_allocfilegv Perl_clone_params_del Perl_clone_params_new Perl_parser_dup @@ -394,6 +399,13 @@ unless ($define{'USE_ITHREADS'}) { ); } +unless ($define{'HAS_NEWLOCALE'} && ! $define{'NO_POSIX_2008_LOCALE'}) +{ + ++$skip{$_} foreach qw( + PL_C_locale_obj + ); +} + unless ($define{'PERL_IMPLICIT_CONTEXT'}) { ++$skip{$_} foreach qw( PL_my_cxt_index @@ -418,25 +430,19 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) { ); } -unless ($define{'PL_OP_SLAB_ALLOC'}) { +unless ($define{'PERL_OP_PARENT'}) { ++$skip{$_} foreach qw( - PL_OpPtr - PL_OpSlab - PL_OpSpace - Perl_Slab_Alloc - Perl_Slab_Free - ); + Perl_op_parent + ); } -unless ($define{'PERL_DEBUG_READONLY_OPS'}) { +unless ($define{'USE_DTRACE'}) { ++$skip{$_} foreach qw( - PL_slab_count - PL_slabs - ); -} - -unless ($define{'THREADS_HAVE_PIDS'}) { - ++$skip{PL_ppid}; + Perl_dtrace_probe_call + Perl_dtrace_probe_load + Perl_dtrace_probe_op + Perl_dtrace_probe_phase + ); } unless ($define{'PERL_NEED_APPCTX'}) { @@ -459,10 +465,6 @@ unless ($define{'PERL_DONT_CREATE_GVSV'}) { ++$skip{Perl_gv_SVadd}; } -if ($define{'SPRINTF_RETURNS_STRLEN'}) { - ++$skip{Perl_my_sprintf}; -} - unless ($define{'PERL_USES_PL_PIDSTATUS'}) { ++$skip{PL_pidstatus}; } @@ -471,17 +473,14 @@ unless ($define{'PERL_TRACK_MEMPOOL'}) { ++$skip{PL_memory_debug_header}; } -unless ($define{PERL_MAD}) { - ++$skip{$_} foreach qw( - PL_madskills - PL_xmlfp - ); -} - unless ($define{'MULTIPLICITY'}) { ++$skip{$_} foreach qw( PL_interp_size - PL_interp_size_5_16_0 + PL_interp_size_5_18_0 + PL_sv_yes + PL_sv_undef + PL_sv_no + PL_sv_zero ); } @@ -502,6 +501,26 @@ unless ($define{HAS_MMAP}) { if ($define{HAS_SIGACTION}) { ++$skip{PL_sig_trapped}; + + if ($ARGS{PLATFORM} eq 'vms') { + # FAKE_PERSISTENT_SIGNAL_HANDLERS defined as !defined(HAS_SIGACTION) + ++$skip{PL_sig_ignoring}; + ++$skip{PL_sig_handlers_initted} unless $define{KILL_BY_SIGPRC}; + } +} + +if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) { + # FAKE_DEFAULT_SIGNAL_HANDLERS defined as KILL_BY_SIGPRC + ++$skip{Perl_csighandler_init}; + ++$skip{Perl_my_kill}; + ++$skip{Perl_sig_to_vmscondition}; + ++$skip{PL_sig_defaulting}; + ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION}; +} + +if ($define{'HAS_STRNLEN'}) +{ + ++$skip{Perl_my_strnlen}; } unless ($define{USE_LOCALE_COLLATE}) { @@ -525,6 +544,11 @@ unless ($define{USE_LOCALE_NUMERIC}) { ); } +unless ($define{'USE_C_BACKTRACE'}) { + ++$skip{Perl_get_c_backtrace_dump}; + ++$skip{Perl_dump_c_backtrace}; +} + unless ($define{HAVE_INTERP_INTERN}) { ++$skip{$_} foreach qw( Perl_sys_intern_clear @@ -539,16 +563,26 @@ 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}; ++$export{Perl_GetVars}; - try_symbols(qw(PL_Vars PL_VarsPtr)) unless $CCTYPE eq 'GCC'; + try_symbols(qw(PL_Vars PL_VarsPtr)) + unless $ARGS{CCTYPE} eq 'GCC' || $define{PERL_GLOBAL_STRUCT_PRIVATE}; } else { ++$skip{$_} foreach qw(Perl_init_global_struct Perl_free_global_struct); } +++$skip{PL_op_exec_cnt} + unless $define{PERL_TRACE_OPS}; + +++$skip{PL_hash_chars} + unless $define{PERL_USE_SINGLE_CHAR_HASH_CACHE}; + # 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 @@ -561,6 +595,7 @@ my @layer_syms = qw( PerlIOBase_eof PerlIOBase_error PerlIOBase_fileno + PerlIOBase_open PerlIOBase_noop_fail PerlIOBase_noop_ok PerlIOBase_popped @@ -616,6 +651,8 @@ my @layer_syms = qw( Perl_PerlIO_get_cnt Perl_PerlIO_get_ptr Perl_PerlIO_read + Perl_PerlIO_restore_errno + Perl_PerlIO_save_errno Perl_PerlIO_seek Perl_PerlIO_set_cnt Perl_PerlIO_set_ptrcnt @@ -627,117 +664,21 @@ my @layer_syms = qw( Perl_PerlIO_unread Perl_PerlIO_write ); -if ($PLATFORM eq 'netware') { +if ($ARGS{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{$_} foreach @layer_syms; - ++$skip{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 - # And emit them - ++$skip{$_} foreach 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 - 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 - try_symbols(@layer_syms, 'perlsio_binmode'); - } -} else { - # -Uuseperlio - # Skip the PerlIO layer symbols - although - # nothing should have exported them anyway. - ++$skip{$_} foreach @layer_syms; - ++$skip{$_} foreach qw( - perlsio_binmode - PL_def_layerlist - PL_known_layers - PL_perlio - PL_perlio_debug_fd - PL_perlio_fd_refcnt - PL_perlio_fd_refcnt_size - PL_perlio_mutex - ); +# Export the symbols that make up the PerlIO abstraction, regardless +# of its implementation - read from a file +push @syms, 'perlio.sym'; - # Also do NOT add abstraction symbols from $perlio_sym - # abstraction is done as #define to stdio - # Remaining remnants that _may_ be functions are handled below. +# PerlIO with layers - export implementation +try_symbols(@layer_syms, 'perlsio_binmode'); + + +unless ($define{'USE_QUADMATH'}) { + ++$skip{Perl_quadmath_format_needed}; + ++$skip{Perl_quadmath_format_single}; } ############################################################################### @@ -745,35 +686,55 @@ 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) { - open (GLOBAL, "<$syms") || die "failed to open $syms: $!\n"; - while () { - next if (!/^[A-Za-z]/); - # Functions have a Perl_ prefix - # Variables have a PL_ prefix - chomp($_); - my $symbol = ($syms =~ /var\.sym$/i ? "PL_" : ""); - $symbol .= $_; +{ + my %seen; + my ($embed) = setup_embed($ARGS{TARG_DIR}); + + foreach (@$embed) { + my ($flags, $retval, $func, @args) = @$_; + next unless $func; + if ( ($flags =~ /[AX]/ && $flags !~ /[xmi]/) + || ($flags =~ /b/ && ! $define{'NO_MATHOMS'})) + { + # 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}++; + # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ? + $func = "Perl_$func" if ($flags =~ /[pX]/ && $func !~ /^Perl_/); + ++$export{$func} unless exists $skip{$func}; + } + } +} + +foreach (@syms) { + my $syms = $ARGS{TARG_DIR} . $_; + open my $global, '<', $syms or die "failed to open $syms: $!\n"; + while (<$global>) { + next unless /^([A-Za-z].*)/; + my $symbol = "$1"; ++$export{$symbol} unless exists $skip{$symbol}; } - close(GLOBAL); } # 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 ($PLATFORM eq 'aix' or $PLATFORM eq 'os2') { # OS/2 needs PL_thr_key - readvar($perlvars_h, \%export); + if ($ARGS{PLATFORM} eq 'aix' or $ARGS{PLATFORM} eq 'os2') { # OS/2 needs PL_thr_key + 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); } } @@ -785,15 +746,11 @@ try_symbols(qw( PerlIO_getpos PerlIO_init PerlIO_setpos - PerlIO_sprintf PerlIO_tmpfile - PerlIO_vsprintf )); -if ($PLATFORM eq 'win32') { +if ($ARGS{PLATFORM} eq 'win32') { try_symbols(qw( - setgid - setuid win32_free_childdir win32_free_childenv win32_get_childdir @@ -802,7 +759,11 @@ if ($PLATFORM eq 'win32') { )); } -if ($PLATFORM =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} eq 'wince') { + ++$skip{'win32_isatty'}; # commit 4342f4d6df is win32-only +} + +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { try_symbols(qw( Perl_init_os_extras Perl_thread_create @@ -958,11 +919,8 @@ if ($PLATFORM =~ /^win(?:32|ce)$/) { win32_getchar win32_putchar )); - if ($CCTYPE eq "BORLAND") { - try_symbols('_matherr'); - } } -elsif ($PLATFORM eq 'vms') { +elsif ($ARGS{PLATFORM} eq 'vms') { try_symbols(qw( Perl_cando Perl_cando_by_name @@ -989,11 +947,11 @@ elsif ($PLATFORM eq 'vms') { Perl_my_gconvert Perl_my_getenv Perl_my_getenv_len - Perl_my_getlogin Perl_my_getpwnam Perl_my_getpwuid Perl_my_gmtime Perl_my_kill + Perl_my_killpg Perl_my_localtime Perl_my_mkdir Perl_my_sigaction @@ -1047,7 +1005,7 @@ elsif ($PLATFORM eq 'vms') { PerlIO_openn )); } -elsif ($PLATFORM eq 'os2') { +elsif ($ARGS{PLATFORM} eq 'os2') { try_symbols(qw( ctermid get_sysinfo @@ -1116,7 +1074,7 @@ elsif ($PLATFORM eq 'os2') { PL_do_undump )); } -elsif ($PLATFORM eq 'netware') { +elsif ($ARGS{PLATFORM} eq 'netware') { try_symbols(qw( Perl_init_os_extras Perl_thread_create @@ -1265,17 +1223,18 @@ elsif ($PLATFORM eq 'netware') { # static extensions with -fPIC, but links them to perl, not libperl.so # The VMS build scripts don't yet implement static extensions at all. -if ($PLATFORM =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { # records of type boot_module for statically linked modules (except Dynaloader) + my $static_ext = $Config{static_ext} // ""; $static_ext =~ s/\//__/g; $static_ext =~ s/\bDynaLoader\b//; try_symbols(map {"boot_$_"} grep {/\S/} split /\s+/, $static_ext); try_symbols("init_Win32CORE") if $static_ext =~ /\bWin32CORE\b/; } -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { my (%mapped, @missing); - open MAP, 'miniperl.map' or die 'Cannot read miniperl.map'; + open MAP, '<', 'miniperl.map' or die 'Cannot read miniperl.map'; /^\s*[\da-f:]+\s+(\w+)/i and $mapped{$1}++ foreach ; close MAP or die 'Cannot close miniperl.map'; @@ -1291,22 +1250,23 @@ if ($PLATFORM eq 'os2') { # Start with platform specific headers: -if ($PLATFORM =~ /^win(?:32|ce)$/) { - (my $dll = ($define{PERL_DLL} || "perl515")) =~ s/\.dll$//i; +if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { + my $dll = $define{PERL_DLL} ? $define{PERL_DLL} =~ s/\.dll$//ir + : "perl$Config{api_revision}$Config{api_version}"; print "LIBRARY $dll\n"; # The DESCRIPTION module definition file statement is not supported # by VC7 onwards. - if ($CCTYPE =~ /^(?:MSVC60|GCC|BORLAND)$/) { + if ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) { print "DESCRIPTION 'Perl interpreter'\n"; } print "EXPORTS\n"; } -elsif ($PLATFORM eq 'os2') { +elsif ($ARGS{PLATFORM} eq 'os2') { (my $v = $]) =~ s/(\d\.\d\d\d)(\d\d)$/$1_$2/; - $v .= '-thread' if $define{archname} =~ /-thread/; + $v .= '-thread' if $Config{archname} =~ /-thread/; (my $dll = $define{PERL_DLL}) =~ s/\.dll$//i; - $v .= "\@$define{perl_patchlevel}" if $define{perl_patchlevel}; - my $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $define{config_args}'"; + $v .= "\@$Config{perl_patchlevel}" if $Config{perl_patchlevel}; + my $d = "DESCRIPTION '\@#perl5-porters\@perl.org:$v#\@ Perl interpreter, configured as $Config{config_args}'"; $d = substr($d, 0, 249) . "...'" if length $d > 253; print <<"---EOP---"; LIBRARY '$dll' INITINSTANCE TERMINSTANCE @@ -1317,7 +1277,7 @@ DATA LOADONCALL NONSHARED MULTIPLE EXPORTS ---EOP--- } -elsif ($PLATFORM eq 'aix') { +elsif ($ARGS{PLATFORM} eq 'aix') { my $OSVER = `uname -v`; chop $OSVER; my $OSREL = `uname -r`; @@ -1328,9 +1288,9 @@ elsif ($PLATFORM eq 'aix') { print "#!\n"; } } -elsif ($PLATFORM eq 'netware') { - if ($FILETYPE eq 'def') { - print "LIBRARY perl515\n"; +elsif ($ARGS{PLATFORM} eq 'netware') { + if ($ARGS{FILETYPE} eq 'def') { + print "LIBRARY perl$Config{api_revision}$Config{api_version}\n"; print "DESCRIPTION 'Perl interpreter for NetWare'\n"; print "EXPORTS\n"; } @@ -1338,12 +1298,18 @@ elsif ($PLATFORM eq 'netware') { # Then the symbols -foreach my $symbol (sort keys %export) { - if ($PLATFORM =~ /^win(?:32|ce)$/) { - $symbol = "_$symbol" if $CCTYPE eq 'BORLAND'; - print "\t$symbol\n"; +my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export; +foreach my $symbol (@symbols) { + if (PLATFORM eq 'win32' || PLATFORM eq 'wince') { + # Remembering the origin file of each symbol is an alternative to PL_ matching + if (substr($symbol, 0, 3) eq 'PL_') { + print "\t$symbol DATA\n"; + } + else { + print "\t$symbol\n"; + } } - elsif ($PLATFORM eq 'os2') { + elsif (PLATFORM eq 'os2') { printf qq( %-31s \@%s\n), qq("$symbol"), $ordinal{$symbol} || ++$sym_ord; printf qq( %-31s \@%s\n), @@ -1351,7 +1317,7 @@ foreach my $symbol (sort keys %export) { $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord if $exportperlmalloc and exists $exportperlmalloc{$symbol}; } - elsif ($PLATFORM eq 'netware') { + elsif (PLATFORM eq 'netware') { print "\t$symbol,\n"; } else { print "$symbol\n"; @@ -1360,7 +1326,7 @@ foreach my $symbol (sort keys %export) { # Then platform specific footers. -if ($PLATFORM eq 'os2') { +if ($ARGS{PLATFORM} eq 'os2') { print <