}
use constant PLATFORM => $ARGS{PLATFORM};
-require "$ARGS{TARG_DIR}regen/embed_lib.pl";
+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.
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
|KILL_BY_SIGPRC
|(?:PERL|USE|HAS)_\w+)\b/x;
}
$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;
+ }
+}
+
+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"
++$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
);
}
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
);
}
);
}
-unless ($define{'PERL_COPY_ON_WRITE'}) {
+if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) {
++$skip{Perl_sv_setsv_cow};
}
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
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_lc_numeric_mutex
+ PL_lc_numeric_mutex_depth
PL_my_ctx_mutex
PL_perlio_mutex
PL_stashpad
);
}
+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
);
}
-unless ($define{'PERL_OP_PARENT'}) {
- ++$skip{$_} foreach qw(
- Perl_op_parent
- );
+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};
+ }
}
-if ($define{'NO_MATHOMS'}) {
- # win32 builds happen in the win32/ subdirectory, but vms builds happen
- # at the top level, so we need to look in two candidate locations for
- # the mathoms.c file.
- my ($file) = grep { -f } qw( mathoms.c ../mathoms.c )
- or die "No mathoms.c file found in . or ..\n";
- open my $mathoms, '<', $file
- or die "Cannot open $file: $!\n";
- while (<$mathoms>) {
- ++$skip{$1} if /\A ( NATIVE_TO_NEED
- | ASCII_TO_NEED
- | Perl_\w+ ) \s* \( /axms;
- }
+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{'PERL_NEED_APPCTX'}) {
++$skip{Perl_gv_SVadd};
}
-if ($define{'SPRINTF_RETURNS_STRLEN'}) {
- ++$skip{Perl_my_sprintf};
-}
-
unless ($define{'PERL_USES_PL_PIDSTATUS'}) {
++$skip{PL_pidstatus};
}
++$skip{$_} foreach qw(
PL_interp_size
PL_interp_size_5_18_0
+ PL_sv_yes
+ PL_sv_undef
+ PL_sv_no
+ PL_sv_zero
);
}
unless ($define{'PERL_GLOBAL_STRUCT_PRIVATE'}) {
++$skip{$_} foreach qw(
PL_my_cxt_keys
+ PL_my_cxt_keys_size
Perl_my_cxt_index
);
}
++$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
PL_collxfrm_mult
Perl_sv_collxfrm
Perl_sv_collxfrm_flags
+ PL_strxfrm_NUL_replacement
+ PL_strxfrm_is_behaved
+ PL_strxfrm_max_cp
);
}
PL_numeric_name
PL_numeric_radix_sv
PL_numeric_standard
+ PL_numeric_underlying
+ PL_numeric_underlying_is_standard
+ PL_underlying_numeric_obj
);
}
++$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);
{
my %seen;
my ($embed) = setup_embed($ARGS{TARG_DIR});
+ my $excludedre = $define{'NO_MATHOMS'} ? qr/[xmib]/ : qr/[xmi]/;
foreach (@$embed) {
my ($flags, $retval, $func, @args) = @$_;
next unless $func;
- if ($flags =~ /[AX]/ && $flags !~ /[xmi]/ || $flags =~ /b/) {
+ if (($flags =~ /[AX]/ && $flags !~ $excludedre)
+ || (!$define{'NO_MATHOMS'} && $flags =~ /b/))
+ {
# public API, so export
# If a function is defined twice, for example before and after
# 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};
}
}
win32_realloc
win32_free
win32_sleep
+ win32_pause
win32_times
win32_access
win32_alarm
Perl_my_getpwuid
Perl_my_gmtime
Perl_my_kill
+ Perl_my_killpg
Perl_my_localtime
Perl_my_mkdir
Perl_my_sigaction
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 <MAP>;
close MAP or die 'Cannot close miniperl.map';