X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/eacbb37937698a035d5ed63fcbdf15dd4eab56cf..52f0fcf7f01b33490cb4d9804cd6405b3a3187d2:/makedef.pl?ds=sidebyside diff --git a/makedef.pl b/makedef.pl index 5f26bcb..9af199d 100644 --- a/makedef.pl +++ b/makedef.pl @@ -32,37 +32,34 @@ # perl.imp NetWare # makedef.lis VMS -BEGIN { unshift @INC, "lib" } -use Config; -use strict; - -my %ARGS = (CCTYPE => 'MSVC', TARG_DIR => ''); - +my $fold; +my %ARGS; my %define; -my $fold; +BEGIN { + BEGIN { unshift @INC, "lib" } + use Config; + use strict; -sub process_cc_flags { - foreach (map {split /\s+/, $_} @_) { - $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/; - } -} + %ARGS = (CCTYPE => 'MSVC', TARG_DIR => ''); -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; + sub process_cc_flags { + foreach (map {split /\s+/, $_} @_) { + $define{$1} = $2 // 1 if /^-D(\w+)(?:=(.+))?/; + } } -} - -require "$ARGS{TARG_DIR}regen/embed_lib.pl"; -{ - my @PLATFORM = qw(aix win32 wince os2 netware vms test); + 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; + } + } + my @PLATFORM = qw(aix win32 os2 netware vms test); my %PLATFORM; @PLATFORM{@PLATFORM} = (); @@ -71,12 +68,14 @@ require "$ARGS{TARG_DIR}regen/embed_lib.pl"; die "PLATFORM must be one of: @PLATFORM\n" unless exists $PLATFORM{$ARGS{PLATFORM}}; } +use constant PLATFORM => $ARGS{PLATFORM}; + +require "./$ARGS{TARG_DIR}regen/embed_lib.pl"; # 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'; + if $ARGS{PLATFORM} ne 'win32' && $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 @@ -87,12 +86,9 @@ process_cc_flags(@Config{qw(ccflags optimize)}) # the user might have chosen to disable because the canned configs are # minimal configs that don't include any of those 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 @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 = ( @@ -108,7 +104,6 @@ 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; } @@ -126,10 +121,48 @@ $define{PERL_IMPLICIT_CONTEXT} ||= $define{USE_ITHREADS} || $define{MULTIPLICITY} ; -if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $^O ne 'darwin') { +if ($define{USE_ITHREADS} && $ARGS{PLATFORM} ne 'win32' && $ARGS{PLATFORM} ne 'netware') { $define{USE_REENTRANT_API} = 1; } +if (! $define{NO_LOCALE}) { + if ( ! $define{NO_POSIX_2008_LOCALE} + && $define{HAS_NEWLOCALE} + && $define{HAS_USELOCALE} + && $define{HAS_DUPLOCALE} + && $define{HAS_FREELOCALE}) + { + $define{HAS_POSIX_2008_LOCALE} = 1; + $define{USE_LOCALE} = 1; + } + elsif ($define{HAS_SETLOCALE}) { + $define{USE_LOCALE} = 1; + } +} + +# https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering +my $cctype = $ARGS{CCTYPE} =~ s/MSVC//r; +if (! $define{HAS_SETLOCALE} && $define{HAS_POSIX_2008_LOCALE}) { + $define{USE_POSIX_2008_LOCALE} = 1; + $define{USE_THREAD_SAFE_LOCALE} = 1; +} +elsif ( ($define{USE_ITHREADS} || $define{USE_THREAD_SAFE_LOCALE}) + && ( $define{HAS_POSIX_2008_LOCALE} + || ($ARGS{PLATFORM} eq 'win32' && ( $cctype !~ /\D/ + && $cctype >= 80))) + && ! $define{NO_THREAD_SAFE_LOCALE}) +{ + $define{USE_THREAD_SAFE_LOCALE} = 1 unless $define{USE_THREAD_SAFE_LOCALE}; + $define{USE_POSIX_2008_LOCALE} = 1 if $define{HAS_POSIX_2008_LOCALE}; +} + +if ( $ARGS{PLATFORM} eq 'win32' + && $define{USE_THREAD_SAFE_LOCALE} + && $cctype < 140) +{ + $define{TS_W32_BROKEN_LOCALECONV} = 1; +} + # perl.h logic duplication ends print STDERR "Defines: (" . join(' ', sort keys %define) . ")\n" @@ -171,7 +204,7 @@ sub readvar { my $file = $ARGS{TARG_DIR} . shift; my $hash = shift; my $proc = shift; - open my $vars, '<', $file or die die "Cannot open $file: $!\n"; + open my $vars, '<', $file or die "Cannot open $file: $!\n"; while (<$vars>) { # All symbols have a Perl_ prefix because that's what embed.h sticks @@ -186,9 +219,7 @@ sub readvar { if ($ARGS{PLATFORM} ne 'os2') { ++$skip{$_} foreach qw( - PL_cryptseen PL_opsave - Perl_GetVars Perl_dump_fds Perl_my_bcopy Perl_my_bzero @@ -206,13 +237,13 @@ if ($ARGS{PLATFORM} ne 'os2') { ++$skip{Perl_my_symlink} unless $Config{d_symlink}; } else { ++$skip{PL_statusvalue_vms}; + ++$skip{PL_perllib_sep}; if ($ARGS{PLATFORM} ne 'aix') { ++$skip{$_} foreach qw( PL_DBcv PL_generation PL_lastgotoprobe PL_modcount - PL_timesbuf main ); } @@ -253,11 +284,11 @@ unless ($define{'DEBUGGING'}) { Perl_debstackptrs Perl_pad_sv Perl_pad_setsv + Perl__setlocale_debug_string Perl_set_padlist Perl_hv_assert PL_watchaddr PL_watchok - PL_watch_pvx ); } @@ -285,8 +316,7 @@ else { ); } -unless ($define{'PERL_OLD_COPY_ON_WRITE'} - || $define{'PERL_NEW_COPY_ON_WRITE'}) { +if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) { ++$skip{Perl_sv_setsv_cow}; } @@ -327,44 +357,23 @@ if ($define{'PERL_USE_SAFE_PUTENV'}) { unless ($define{'USE_ITHREADS'}) { ++$skip{PL_thr_key}; + ++$skip{PL_user_prop_mutex}; + ++$skip{PL_user_def_props_aTHX}; } -# USE_5005THREADS symbols. Kept as reference for easier removal -++$skip{$_} foreach qw( - PL_sv_mutex - PL_strtab_mutex - PL_svref_mutex - PL_cred_mutex - PL_eval_mutex - PL_fdpid_mutex - PL_sv_lock_mutex - PL_eval_cond - PL_eval_owner - PL_threads_mutex - PL_nthreads - PL_nthreads_cond - PL_threadnum - PL_threadsv_names - PL_thrsv - PL_vtbl_mutex - Perl_condpair_magic - Perl_new_struct_thread - Perl_per_thread_magicals - Perl_thread_create - Perl_find_threadsv - Perl_unlock_condpair - Perl_magic_mutexfree - Perl_sv_lock - ); - 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_env_mutex PL_hints_mutex + PL_locale_mutex + PL_lc_numeric_mutex + PL_lc_numeric_mutex_depth PL_my_ctx_mutex PL_perlio_mutex PL_stashpad @@ -398,12 +407,33 @@ unless ($define{'USE_ITHREADS'}) { ); } +if ( $define{NO_LOCALE} + || (! $define{USE_ITHREADS} && ! $define{USE_THREAD_SAFE_LOCALE})) +{ + ++$skip{$_} foreach qw( + PL_C_locale_obj + PL_curlocales + ); +} + +unless ( $define{'HAS_NEWLOCALE'} + && $define{'HAS_FREELOCALE'} + && $define{'HAS_USELOCALE'} + && ! $define{'NO_POSIX_2008_LOCALE'}) +{ + ++$skip{$_} foreach qw( + PL_C_locale_obj + PL_underlying_numeric_obj + ); +} + unless ($define{'PERL_IMPLICIT_CONTEXT'}) { ++$skip{$_} foreach qw( PL_my_cxt_index PL_my_cxt_list PL_my_cxt_size PL_my_cxt_keys + PL_my_cxt_keys_size Perl_croak_nocontext Perl_die_nocontext Perl_deb_nocontext @@ -421,165 +451,22 @@ unless ($define{'PERL_IMPLICIT_CONTEXT'}) { Perl_my_cxt_index ); } -if ($define{'NO_MATHOMS'}) { - ++$skip{$_} foreach qw( - ASCII_TO_NEED - NATIVE_TO_NEED - Perl_custom_op_desc - Perl_custom_op_name - Perl_do_aexec - Perl_do_binmode - Perl_do_open - Perl_do_open9 - Perl_fprintf_nocontext - Perl_gv_AVadd - Perl_gv_HVadd - Perl_gv_IOadd - Perl_gv_SVadd - Perl_gv_efullname - Perl_gv_efullname3 - Perl_gv_fetchmethod - Perl_gv_fullname - Perl_gv_fullname3 - Perl_hv_delete - Perl_hv_delete_ent - Perl_hv_exists - Perl_hv_exists_ent - Perl_hv_fetch - Perl_hv_fetch_ent - Perl_hv_iternext - Perl_hv_magic - Perl_hv_store - Perl_hv_store_ent - Perl_hv_store_flags - Perl_init_i18nl14n - Perl_isALNUM_lazy - Perl_isIDFIRST_lazy - Perl_is_uni_alnum - Perl_is_uni_alnum_lc - Perl_is_uni_alnumc - Perl_is_uni_alnumc_lc - Perl_is_uni_alpha - Perl_is_uni_alpha_lc - Perl_is_uni_ascii - Perl_is_uni_ascii_lc - Perl_is_uni_blank - Perl_is_uni_blank_lc - Perl_is_uni_cntrl - Perl_is_uni_cntrl_lc - Perl_is_uni_digit - Perl_is_uni_digit_lc - Perl_is_uni_graph - Perl_is_uni_graph_lc - Perl_is_uni_idfirst - Perl_is_uni_idfirst_lc - Perl_is_uni_lower - Perl_is_uni_lower_lc - Perl_is_uni_print - Perl_is_uni_print_lc - Perl_is_uni_punct - Perl_is_uni_punct_lc - Perl_is_uni_space - Perl_is_uni_space_lc - Perl_is_uni_upper - Perl_is_uni_upper_lc - Perl_is_uni_xdigit - Perl_is_uni_xdigit_lc - Perl_is_utf8_alnum - Perl_is_utf8_alnumc - Perl_is_utf8_alpha - Perl_is_utf8_ascii - Perl_is_utf8_blank - Perl_is_utf8_char - Perl_is_utf8_cntrl - Perl_is_utf8_digit - Perl_is_utf8_graph - Perl_is_utf8_idcont - Perl_is_utf8_idfirst - Perl_is_utf8_lower - Perl_is_utf8_mark - Perl_is_utf8_perl_space - Perl_is_utf8_perl_word - Perl_is_utf8_posix_digit - Perl_is_utf8_print - Perl_is_utf8_punct - Perl_is_utf8_space - Perl_is_utf8_string_loc - Perl_is_utf8_upper - Perl_is_utf8_xdigit - Perl_is_utf8_xidcont - Perl_is_utf8_xidfirst - Perl_my_lstat - Perl_my_stat - Perl_newAV - Perl_newHV - Perl_newIO - Perl_newSUB - Perl_pack_cat - Perl_printf_nocontext - Perl_ref - Perl_save_freeop - Perl_save_freepv - Perl_save_freesv - Perl_save_iv - Perl_save_list - Perl_save_long - Perl_save_mortalizesv - Perl_save_nogv - Perl_save_op - Perl_save_re_context - Perl_sv_2iv - Perl_sv_2pv - Perl_sv_2pv_nolen - Perl_sv_2pvbyte_nolen - Perl_sv_2pvutf8_nolen - Perl_sv_2uv - Perl_sv_catpvn - Perl_sv_catpvn_mg - Perl_sv_catsv - Perl_sv_catsv_mg - Perl_sv_force_normal - Perl_sv_insert - Perl_sv_iv - Perl_sv_mortalcopy - Perl_sv_nolocking - Perl_sv_nounlocking - Perl_sv_nv - Perl_sv_pv - Perl_sv_pvbyte - Perl_sv_pvbyten - Perl_sv_pvn - Perl_sv_pvn_force - Perl_sv_pvn_nomg - Perl_sv_pvutf8 - Perl_sv_pvutf8n - Perl_sv_setsv - Perl_sv_taint - Perl_sv_unref - Perl_sv_usepvn - Perl_sv_usepvn_mg - Perl_sv_utf8_upgrade - Perl_sv_uv - Perl_to_uni_lower_lc - Perl_to_uni_title_lc - Perl_to_uni_upper_lc - Perl_to_utf8_fold - Perl_to_utf8_lower - Perl_to_utf8_title - Perl_to_utf8_upper - Perl_unpack_str - Perl_utf8_to_uvchr - Perl_utf8_to_uvuni - Perl_valid_utf8_to_uvuni - ); -} -unless ($define{'PERL_NEED_APPCTX'}) { - ++$skip{PL_appctx}; +if ($define{USE_THREAD_SAFE_LOCALE}) { + ++$skip{PL_lc_numeric_mutex}; + ++$skip{PL_lc_numeric_mutex_depth}; + if (! $define{TS_W32_BROKEN_LOCALECONV}) { + ++$skip{PL_locale_mutex}; + } } -unless ($define{'PERL_NEED_TIMESBASE'}) { - ++$skip{PL_timesbase}; +unless ($define{'USE_DTRACE'}) { + ++$skip{$_} foreach qw( + Perl_dtrace_probe_call + Perl_dtrace_probe_load + Perl_dtrace_probe_op + Perl_dtrace_probe_phase + ); } unless ($define{'DEBUG_LEAKING_SCALARS'}) { @@ -594,10 +481,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}; } @@ -610,17 +493,10 @@ unless ($define{'MULTIPLICITY'}) { ++$skip{$_} foreach qw( PL_interp_size PL_interp_size_5_18_0 - ); -} - -unless ($define{'PERL_GLOBAL_STRUCT'}) { - ++$skip{PL_global_struct_size}; -} - -unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) { - ++$skip{$_} foreach qw( - PL_my_cxt_keys - Perl_my_cxt_index + PL_sv_yes + PL_sv_undef + PL_sv_no + PL_sv_zero ); } @@ -647,6 +523,11 @@ if ($ARGS{PLATFORM} eq 'vms' && !$define{KILL_BY_SIGPRC}) { ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION}; } +if ($define{'HAS_STRNLEN'}) +{ + ++$skip{Perl_my_strnlen}; +} + unless ($define{USE_LOCALE_COLLATE}) { ++$skip{$_} foreach qw( PL_collation_ix @@ -656,6 +537,9 @@ unless ($define{USE_LOCALE_COLLATE}) { PL_collxfrm_mult Perl_sv_collxfrm Perl_sv_collxfrm_flags + PL_strxfrm_NUL_replacement + PL_strxfrm_is_behaved + PL_strxfrm_max_cp ); } @@ -665,6 +549,9 @@ unless ($define{USE_LOCALE_NUMERIC}) { PL_numeric_name PL_numeric_radix_sv PL_numeric_standard + PL_numeric_underlying + PL_numeric_underlying_is_standard + PL_underlying_numeric_obj ); } @@ -686,21 +573,12 @@ if ($define{HAS_SIGNBIT}) { ++$skip{Perl_signbit}; } -if ($define{'PERL_GLOBAL_STRUCT'}) { - 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 $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 = qw(globvar.sym); @@ -772,6 +650,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 @@ -787,39 +667,31 @@ if ($ARGS{PLATFORM} eq 'netware') { push(@layer_syms,'PL_def_layerlist','PL_known_layers','PL_perlio'); } -if ($define{'USE_PERLIO'}) { - # Export the symbols that make up the PerlIO abstraction, regardless - # of its implementation - read from a file - push @syms, 'perlio.sym'; +# Export the symbols that make up the PerlIO abstraction, regardless +# of its implementation - read from a file +push @syms, 'perlio.sym'; - # 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 - ); +# PerlIO with layers - export implementation +try_symbols(@layer_syms, 'perlsio_binmode'); - # 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. -} unless ($define{'USE_QUADMATH'}) { ++$skip{Perl_quadmath_format_needed}; ++$skip{Perl_quadmath_format_single}; } +unless ($Config{d_mbrlen}) { + ++$skip{PL_mbrlen_ps}; +} + +unless ($Config{d_mbrtowc}) { + ++$skip{PL_mbrtowc_ps}; +} + +unless ($Config{d_wcrtomb}) { + ++$skip{PL_wcrtomb_ps}; +} + ############################################################################### # At this point all skip lists should be completed, as we are about to test @@ -828,11 +700,14 @@ unless ($define{'USE_QUADMATH'}) { { my %seen; my ($embed) = setup_embed($ARGS{TARG_DIR}); + my $excludedre = $define{'NO_MATHOMS'} ? qr/[emib]/ : qr/[emi]/; foreach (@$embed) { my ($flags, $retval, $func, @args) = @$_; next unless $func; - if ($flags =~ /[AX]/ && $flags !~ /[xmi]/ || $flags =~ /b/) { + if (($flags =~ /[AXC]/ && $flags !~ $excludedre) + || (!$define{'NO_MATHOMS'} && $flags =~ /b/)) + { # public API, so export # If a function is defined twice, for example before and after @@ -841,7 +716,7 @@ unless ($define{'USE_QUADMATH'}) { # mean "don't export" next if $seen{$func}++; # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ? - $func = "Perl_$func" if ($flags =~ /[pbX]/ && $func !~ /^Perl_/); + $func = "Perl_$func" if ($flags =~ /[pX]/ && $func !~ /^Perl_/); ++$export{$func} unless exists $skip{$func}; } } @@ -859,20 +734,9 @@ foreach (@syms) { # variables -if ($define{'MULTIPLICITY'} && $define{PERL_GLOBAL_STRUCT}) { - 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); - } -} -else { - unless ($define{'PERL_GLOBAL_STRUCT'}) { - readvar('perlvars.h', \%export); - } - unless ($define{MULTIPLICITY}) { - readvar('intrpvar.h', \%export); - } +readvar('perlvars.h', \%export); +unless ($define{MULTIPLICITY}) { + readvar('intrpvar.h', \%export); } # Oddities from PerlIO @@ -888,173 +752,164 @@ try_symbols(qw( if ($ARGS{PLATFORM} eq 'win32') { try_symbols(qw( - win32_free_childdir - win32_free_childenv - win32_get_childdir - win32_get_childenv - win32_spawnvp - )); -} - -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 - Perl_win32_init - Perl_win32_term - RunPerl - win32_async_check - win32_errno - win32_environ - win32_abort - win32_fstat - win32_stat - win32_pipe - win32_popen - win32_pclose - win32_rename - win32_setmode - win32_chsize - win32_lseek - win32_tell - win32_dup - win32_dup2 - win32_open - win32_close - win32_eof - win32_isatty - win32_read - win32_write - win32_mkdir - win32_rmdir - win32_chdir - win32_flock - win32_execv - win32_execvp - win32_htons - win32_ntohs - win32_htonl - win32_ntohl - win32_inet_addr - win32_inet_ntoa - win32_socket - win32_bind - win32_listen - win32_accept - win32_connect - win32_send - win32_sendto - win32_recv - win32_recvfrom - win32_shutdown - win32_closesocket - win32_ioctlsocket - win32_setsockopt - win32_getsockopt - win32_getpeername - win32_getsockname - win32_gethostname - win32_gethostbyname - win32_gethostbyaddr - win32_getprotobyname - win32_getprotobynumber - win32_getservbyname - win32_getservbyport - win32_select - win32_endhostent - win32_endnetent - win32_endprotoent - win32_endservent - win32_getnetent - win32_getnetbyname - win32_getnetbyaddr - win32_getprotoent - win32_getservent - win32_sethostent - win32_setnetent - win32_setprotoent - win32_setservent - win32_getenv - win32_putenv - win32_perror - win32_malloc - win32_calloc - win32_realloc - win32_free - win32_sleep - win32_times - win32_access - win32_alarm - win32_chmod - win32_open_osfhandle - win32_get_osfhandle - win32_ioctl - win32_link - win32_unlink - win32_utime - win32_gettimeofday - win32_uname - win32_wait - win32_waitpid - win32_kill - win32_str_os_error - win32_opendir - win32_readdir - win32_telldir - win32_seekdir - win32_rewinddir - win32_closedir - win32_longpath - win32_ansipath - win32_os_id - win32_getpid - win32_crypt - win32_dynaload - win32_clearenv - win32_stdin - win32_stdout - win32_stderr - win32_ferror - win32_feof - win32_strerror - win32_fprintf - win32_printf - win32_vfprintf - win32_vprintf - win32_fread - win32_fwrite - win32_fopen - win32_fdopen - win32_freopen - win32_fclose - win32_fputs - win32_fputc - win32_ungetc - win32_getc - win32_fileno - win32_clearerr - win32_fflush - win32_ftell - win32_fseek - win32_fgetpos - win32_fsetpos - win32_rewind - win32_tmpfile - win32_setbuf - win32_setvbuf - win32_flushall - win32_fcloseall - win32_fgets - win32_gets - win32_fgetc - win32_putc - win32_puts - win32_getchar - win32_putchar + win32_free_childdir + win32_free_childenv + win32_get_childdir + win32_get_childenv + win32_spawnvp + Perl_init_os_extras + Perl_win32_init + Perl_win32_term + RunPerl + win32_async_check + win32_errno + win32_environ + win32_abort + win32_fstat + win32_stat + win32_pipe + win32_popen + win32_pclose + win32_rename + win32_setmode + win32_chsize + win32_lseek + win32_tell + win32_dup + win32_dup2 + win32_open + win32_close + win32_eof + win32_isatty + win32_read + win32_write + win32_mkdir + win32_rmdir + win32_chdir + win32_flock + win32_execv + win32_execvp + win32_htons + win32_ntohs + win32_htonl + win32_ntohl + win32_inet_addr + win32_inet_ntoa + win32_socket + win32_bind + win32_listen + win32_accept + win32_connect + win32_send + win32_sendto + win32_recv + win32_recvfrom + win32_shutdown + win32_closesocket + win32_ioctlsocket + win32_setsockopt + win32_getsockopt + win32_getpeername + win32_getsockname + win32_gethostname + win32_gethostbyname + win32_gethostbyaddr + win32_getprotobyname + win32_getprotobynumber + win32_getservbyname + win32_getservbyport + win32_select + win32_endhostent + win32_endnetent + win32_endprotoent + win32_endservent + win32_getnetent + win32_getnetbyname + win32_getnetbyaddr + win32_getprotoent + win32_getservent + win32_sethostent + win32_setnetent + win32_setprotoent + win32_setservent + win32_getenv + win32_putenv + win32_perror + win32_malloc + win32_calloc + win32_realloc + win32_free + win32_sleep + win32_pause + win32_times + win32_access + win32_alarm + win32_chmod + win32_open_osfhandle + win32_get_osfhandle + win32_ioctl + win32_link + win32_unlink + win32_utime + win32_gettimeofday + win32_uname + win32_wait + win32_waitpid + win32_kill + win32_str_os_error + win32_opendir + win32_readdir + win32_telldir + win32_seekdir + win32_rewinddir + win32_closedir + win32_longpath + win32_ansipath + win32_os_id + win32_getpid + win32_crypt + win32_dynaload + win32_clearenv + win32_stdin + win32_stdout + win32_stderr + win32_ferror + win32_feof + win32_strerror + win32_fprintf + win32_printf + win32_vfprintf + win32_vprintf + win32_fread + win32_fwrite + win32_fopen + win32_fdopen + win32_freopen + win32_fclose + win32_fputs + win32_fputc + win32_ungetc + win32_getc + win32_fileno + win32_clearerr + win32_fflush + win32_ftell + win32_fseek + win32_fgetpos + win32_fsetpos + win32_rewind + win32_tmpfile + win32_setbuf + win32_setvbuf + win32_flushall + win32_fcloseall + win32_fgets + win32_gets + win32_fgetc + win32_putc + win32_puts + win32_getchar + win32_putchar )); } elsif ($ARGS{PLATFORM} eq 'vms') { @@ -1084,11 +939,11 @@ elsif ($ARGS{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 @@ -1214,7 +1069,6 @@ elsif ($ARGS{PLATFORM} eq 'os2') { elsif ($ARGS{PLATFORM} eq 'netware') { try_symbols(qw( Perl_init_os_extras - Perl_thread_create Perl_nw5_init RunPerl AllocStdPerl @@ -1350,17 +1204,15 @@ elsif ($ARGS{PLATFORM} eq 'netware') { )); } -# When added this code was only run for Win32 and WinCE +# When added this code was only run for Win32 (and WinCE at the time) # Currently only Win32 links static extensions into the shared library. -# The WinCE makefile doesn't appear to support static extensions, so this code -# can't have any effect there. # The NetWare Makefile doesn't support static extensions (and hardcodes the # list of dynamic extensions, and the rules to build them) # For *nix (and presumably OS/2) with a shared libperl, Makefile.SH compiles # 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 ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} eq 'win32') { # records of type boot_module for statically linked modules (except Dynaloader) my $static_ext = $Config{static_ext} // ""; $static_ext =~ s/\//__/g; @@ -1371,7 +1223,7 @@ if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { 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'; @@ -1387,13 +1239,13 @@ if ($ARGS{PLATFORM} eq 'os2') { # Start with platform specific headers: -if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { +if ($ARGS{PLATFORM} eq 'win32') { 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 ($ARGS{CCTYPE} =~ /^(?:MSVC60|GCC)$/) { + if ($ARGS{CCTYPE} eq 'GCC') { print "DESCRIPTION 'Perl interpreter'\n"; } print "EXPORTS\n"; @@ -1437,10 +1289,16 @@ elsif ($ARGS{PLATFORM} eq 'netware') { my @symbols = $fold ? sort {lc $a cmp lc $b} keys %export : sort keys %export; foreach my $symbol (@symbols) { - if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) { - print "\t$symbol\n"; + if (PLATFORM eq 'win32') { + # 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 ($ARGS{PLATFORM} eq 'os2') { + elsif (PLATFORM eq 'os2') { printf qq( %-31s \@%s\n), qq("$symbol"), $ordinal{$symbol} || ++$sym_ord; printf qq( %-31s \@%s\n), @@ -1448,7 +1306,7 @@ foreach my $symbol (@symbols) { $ordinal{$exportperlmalloc{$symbol}} || ++$sym_ord if $exportperlmalloc and exists $exportperlmalloc{$symbol}; } - elsif ($ARGS{PLATFORM} eq 'netware') { + elsif (PLATFORM eq 'netware') { print "\t$symbol,\n"; } else { print "$symbol\n";