Document a bit the art of minimizing the installation,

[perl5.git] / embed.h

diff --git a/embed.h b/embed.h
index 4acb7f3..a83e0b8 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -101,6 +101,7 @@
 #define block_gimme            Perl_block_gimme
 #define block_start            Perl_block_start
 #define boot_core_UNIVERSAL    Perl_boot_core_UNIVERSAL
+#define boot_core_PerlIO       Perl_boot_core_PerlIO
 #define call_list              Perl_call_list
 #define cando                  Perl_cando
 #define cast_ulong             Perl_cast_ulong
@@ -343,6 +344,8 @@
 #define vload_module           Perl_vload_module
 #define localize               Perl_localize
 #define looks_like_number      Perl_looks_like_number
+#define grok_number            Perl_grok_number
+#define grok_numeric_radix     Perl_grok_numeric_radix
 #define magic_clearenv         Perl_magic_clearenv
 #define magic_clear_all_env    Perl_magic_clear_all_env
 #define magic_clearpack                Perl_magic_clearpack
@@ -418,7 +421,7 @@
 #define moreswitches           Perl_moreswitches
 #define my                     Perl_my
 #define my_atof                        Perl_my_atof
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
 #define my_bcopy               Perl_my_bcopy
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
@@ -427,6 +430,9 @@
 #define my_exit                        Perl_my_exit
 #define my_failure_exit                Perl_my_failure_exit
 #define my_fflush_all          Perl_my_fflush_all
+#define my_fork                        Perl_my_fork
+#define atfork_lock            Perl_atfork_lock
+#define atfork_unlock          Perl_atfork_unlock
 #define my_lstat               Perl_my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
 #define my_memcmp              Perl_my_memcmp
@@ -668,6 +674,7 @@
 #define sv_collxfrm            Perl_sv_collxfrm
 #endif
 #define sv_compile_2op         Perl_sv_compile_2op
+#define getcwd_sv              Perl_getcwd_sv
 #define sv_dec                 Perl_sv_dec
 #define sv_dump                        Perl_sv_dump
 #define sv_derived_from                Perl_sv_derived_from
@@ -962,9 +969,11 @@
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
-#define doencodes              S_doencodes
 #define refto                  S_refto
 #define seed                   S_seed
+#endif
+#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
+#define doencodes              S_doencodes
 #define mul128                 S_mul128
 #define is_an_int              S_is_an_int
 #define div128                 S_div128
@@ -1015,8 +1024,10 @@
 #define regtail                        S_regtail
 #define regwhite               S_regwhite
 #define nextchar               S_nextchar
+#  ifdef DEBUGGING
 #define dumpuntil              S_dumpuntil
 #define put_byte               S_put_byte
+#  endif
 #define scan_commit            S_scan_commit
 #define cl_anything            S_cl_anything
 #define cl_is_anything         S_cl_is_anything
@@ -1047,12 +1058,24 @@
 #define find_byclass           S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#   ifdef DEBUGGING
 #define deb_curcv              S_deb_curcv
 #define debprof                        S_debprof
+#   endif
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define save_scalar_at         S_save_scalar_at
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define sharedsv_init          Perl_sharedsv_init
+#define sharedsv_new           Perl_sharedsv_new
+#define sharedsv_find          Perl_sharedsv_find
+#define sharedsv_lock          Perl_sharedsv_lock
+#define sharedsv_unlock                Perl_sharedsv_unlock
+#define sharedsv_unlock_scope  Perl_sharedsv_unlock_scope
+#define sharedsv_thrcnt_inc    Perl_sharedsv_thrcnt_inc
+#define sharedsv_thrcnt_dec    Perl_sharedsv_thrcnt_dec
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define asIV                   S_asIV
 #define asUV                   S_asUV
@@ -1098,11 +1121,10 @@
 #define visit                  S_visit
 #define sv_add_backref         S_sv_add_backref
 #define sv_del_backref         S_sv_del_backref
-#  if defined(DEBUGGING)
+#  ifdef DEBUGGING
 #define del_sv                 S_del_sv
 #  endif
 #  if !defined(NV_PRESERVES_UV)
-#define sv_2inuv_non_preserve  S_sv_2inuv_non_preserve
 #define sv_2iuv_non_preserve   S_sv_2iuv_non_preserve
 #  endif
 #define expect_number          S_expect_number
@@ -1116,6 +1138,7 @@
 #define force_version          S_force_version
 #define force_word             S_force_word
 #define tokeq                  S_tokeq
+#define pending_ident          S_pending_ident
 #define scan_const             S_scan_const
 #define scan_formline          S_scan_formline
 #define scan_heredoc           S_scan_heredoc
@@ -1143,7 +1166,9 @@
 #define filter_gets            S_filter_gets
 #define find_in_my_stash       S_find_in_my_stash
 #define new_constant           S_new_constant
+#  if defined(DEBUGGING)
 #define tokereport             S_tokereport
+#  endif
 #define ao                     S_ao
 #define depcom                 S_depcom
 #define incl_perldb            S_incl_perldb
@@ -1161,8 +1186,11 @@
 #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
 #define isa_lookup             S_isa_lookup
 #endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
 #define stdize_locale          S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop            S_closest_cop
 #define mess_alloc             S_mess_alloc
 #  if defined(LEAKTEST)
 #define xstat                  S_xstat
@@ -1176,6 +1204,7 @@
 #define sv_utf8_upgrade_flags  Perl_sv_utf8_upgrade_flags
 #define sv_pvn_force_flags     Perl_sv_pvn_force_flags
 #define sv_2pv_flags           Perl_sv_2pv_flags
+#define my_atof2               Perl_my_atof2
 #define ck_anoncode            Perl_ck_anoncode
 #define ck_bitop               Perl_ck_bitop
 #define ck_concat              Perl_ck_concat
@@ -1188,7 +1217,6 @@
 #define ck_exit                        Perl_ck_exit
 #define ck_ftst                        Perl_ck_ftst
 #define ck_fun                 Perl_ck_fun
-#define ck_fun_locale          Perl_ck_fun_locale
 #define ck_glob                        Perl_ck_glob
 #define ck_grep                        Perl_ck_grep
 #define ck_index               Perl_ck_index
@@ -1206,7 +1234,6 @@
 #define ck_rfun                        Perl_ck_rfun
 #define ck_rvconst             Perl_ck_rvconst
 #define ck_sassign             Perl_ck_sassign
-#define ck_scmp                        Perl_ck_scmp
 #define ck_select              Perl_ck_select
 #define ck_shift               Perl_ck_shift
 #define ck_sort                        Perl_ck_sort
@@ -1619,6 +1646,7 @@
 #define block_gimme()          Perl_block_gimme(aTHX)
 #define block_start(a)         Perl_block_start(aTHX_ a)
 #define boot_core_UNIVERSAL()  Perl_boot_core_UNIVERSAL(aTHX)
+#define boot_core_PerlIO()     Perl_boot_core_PerlIO(aTHX)
 #define call_list(a,b)         Perl_call_list(aTHX_ a,b)
 #define cando(a,b,c)           Perl_cando(aTHX_ a,b,c)
 #define cast_ulong(a)          Perl_cast_ulong(aTHX_ a)
@@ -1841,6 +1869,8 @@
 #define vload_module(a,b,c,d)  Perl_vload_module(aTHX_ a,b,c,d)
 #define localize(a,b)          Perl_localize(aTHX_ a,b)
 #define looks_like_number(a)   Perl_looks_like_number(aTHX_ a)
+#define grok_number(a,b,c)     Perl_grok_number(aTHX_ a,b,c)
+#define grok_numeric_radix(a,b)        Perl_grok_numeric_radix(aTHX_ a,b)
 #define magic_clearenv(a,b)    Perl_magic_clearenv(aTHX_ a,b)
 #define magic_clear_all_env(a,b)       Perl_magic_clear_all_env(aTHX_ a,b)
 #define magic_clearpack(a,b)   Perl_magic_clearpack(aTHX_ a,b)
@@ -1915,7 +1945,7 @@
 #define moreswitches(a)                Perl_moreswitches(aTHX_ a)
 #define my(a)                  Perl_my(aTHX_ a)
 #define my_atof(a)             Perl_my_atof(aTHX_ a)
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
 #define my_bcopy               Perl_my_bcopy
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
@@ -1924,6 +1954,9 @@
 #define my_exit(a)             Perl_my_exit(aTHX_ a)
 #define my_failure_exit()      Perl_my_failure_exit(aTHX)
 #define my_fflush_all()                Perl_my_fflush_all(aTHX)
+#define my_fork                        Perl_my_fork
+#define atfork_lock            Perl_atfork_lock
+#define atfork_unlock          Perl_atfork_unlock
 #define my_lstat()             Perl_my_lstat(aTHX)
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
 #define my_memcmp              Perl_my_memcmp
@@ -2163,6 +2196,7 @@
 #define sv_collxfrm(a,b)       Perl_sv_collxfrm(aTHX_ a,b)
 #endif
 #define sv_compile_2op(a,b,c,d)        Perl_sv_compile_2op(aTHX_ a,b,c,d)
+#define getcwd_sv(a)           Perl_getcwd_sv(aTHX_ a)
 #define sv_dec(a)              Perl_sv_dec(aTHX_ a)
 #define sv_dump(a)             Perl_sv_dump(aTHX_ a)
 #define sv_derived_from(a,b)   Perl_sv_derived_from(aTHX_ a,b)
@@ -2329,17 +2363,17 @@
 #define my_attrs(a,b)          Perl_my_attrs(aTHX_ a,b)
 #define boot_core_xsutils()    Perl_boot_core_xsutils(aTHX)
 #if defined(USE_ITHREADS)
-#define cx_dup(a,b,c)          Perl_cx_dup(aTHX_ a,b,c)
-#define si_dup(a)              Perl_si_dup(aTHX_ a)
-#define ss_dup(a)              Perl_ss_dup(aTHX_ a)
+#define cx_dup(a,b,c,d)                Perl_cx_dup(aTHX_ a,b,c,d)
+#define si_dup(a,b)            Perl_si_dup(aTHX_ a,b)
+#define ss_dup(a,b)            Perl_ss_dup(aTHX_ a,b)
 #define any_dup(a,b)           Perl_any_dup(aTHX_ a,b)
-#define he_dup(a,b)            Perl_he_dup(aTHX_ a,b)
-#define re_dup(a)              Perl_re_dup(aTHX_ a)
+#define he_dup(a,b,c)          Perl_he_dup(aTHX_ a,b,c)
+#define re_dup(a,b)            Perl_re_dup(aTHX_ a,b)
 #define fp_dup(a,b)            Perl_fp_dup(aTHX_ a,b)
 #define dirp_dup(a)            Perl_dirp_dup(aTHX_ a)
-#define gp_dup(a)              Perl_gp_dup(aTHX_ a)
-#define mg_dup(a)              Perl_mg_dup(aTHX_ a)
-#define sv_dup(a)              Perl_sv_dup(aTHX_ a)
+#define gp_dup(a,b)            Perl_gp_dup(aTHX_ a,b)
+#define mg_dup(a,b)            Perl_mg_dup(aTHX_ a,b)
+#define sv_dup(a,b)            Perl_sv_dup(aTHX_ a,b)
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup(a,b)    Perl_sys_intern_dup(aTHX_ a,b)
 #endif
@@ -2450,9 +2484,11 @@
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
-#define doencodes(a,b,c)       S_doencodes(aTHX_ a,b,c)
 #define refto(a)               S_refto(aTHX_ a)
 #define seed()                 S_seed(aTHX)
+#endif
+#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
+#define doencodes(a,b,c)       S_doencodes(aTHX_ a,b,c)
 #define mul128(a,b)            S_mul128(aTHX_ a,b)
 #define is_an_int(a,b)         S_is_an_int(aTHX_ a,b)
 #define div128(a,b)            S_div128(aTHX_ a,b)
@@ -2503,8 +2539,10 @@
 #define regtail(a,b,c)         S_regtail(aTHX_ a,b,c)
 #define regwhite(a,b)          S_regwhite(aTHX_ a,b)
 #define nextchar(a)            S_nextchar(aTHX_ a)
+#  ifdef DEBUGGING
 #define dumpuntil(a,b,c,d,e)   S_dumpuntil(aTHX_ a,b,c,d,e)
 #define put_byte(a,b)          S_put_byte(aTHX_ a,b)
+#  endif
 #define scan_commit(a,b)       S_scan_commit(aTHX_ a,b)
 #define cl_anything(a,b)       S_cl_anything(aTHX_ a,b)
 #define cl_is_anything(a)      S_cl_is_anything(aTHX_ a)
@@ -2534,12 +2572,24 @@
 #define find_byclass(a,b,c,d,e,f)      S_find_byclass(aTHX_ a,b,c,d,e,f)
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#   ifdef DEBUGGING
 #define deb_curcv(a)           S_deb_curcv(aTHX_ a)
 #define debprof(a)             S_debprof(aTHX_ a)
+#   endif
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define save_scalar_at(a)      S_save_scalar_at(aTHX_ a)
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define sharedsv_init()                Perl_sharedsv_init(aTHX)
+#define sharedsv_new()         Perl_sharedsv_new(aTHX)
+#define sharedsv_find(a)       Perl_sharedsv_find(aTHX_ a)
+#define sharedsv_lock(a)       Perl_sharedsv_lock(aTHX_ a)
+#define sharedsv_unlock(a)     Perl_sharedsv_unlock(aTHX_ a)
+#define sharedsv_unlock_scope(a)       Perl_sharedsv_unlock_scope(aTHX_ a)
+#define sharedsv_thrcnt_inc(a) Perl_sharedsv_thrcnt_inc(aTHX_ a)
+#define sharedsv_thrcnt_dec(a) Perl_sharedsv_thrcnt_dec(aTHX_ a)
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define asIV(a)                        S_asIV(aTHX_ a)
 #define asUV(a)                        S_asUV(aTHX_ a)
@@ -2585,11 +2635,10 @@
 #define visit(a)               S_visit(aTHX_ a)
 #define sv_add_backref(a,b)    S_sv_add_backref(aTHX_ a,b)
 #define sv_del_backref(a)      S_sv_del_backref(aTHX_ a)
-#  if defined(DEBUGGING)
+#  ifdef DEBUGGING
 #define del_sv(a)              S_del_sv(aTHX_ a)
 #  endif
 #  if !defined(NV_PRESERVES_UV)
-#define sv_2inuv_non_preserve(a,b)     S_sv_2inuv_non_preserve(aTHX_ a,b)
 #define sv_2iuv_non_preserve(a,b)      S_sv_2iuv_non_preserve(aTHX_ a,b)
 #  endif
 #define expect_number(a)       S_expect_number(aTHX_ a)
@@ -2603,6 +2652,7 @@
 #define force_version(a)       S_force_version(aTHX_ a)
 #define force_word(a,b,c,d,e)  S_force_word(aTHX_ a,b,c,d,e)
 #define tokeq(a)               S_tokeq(aTHX_ a)
+#define pending_ident()                S_pending_ident(aTHX)
 #define scan_const(a)          S_scan_const(aTHX_ a)
 #define scan_formline(a)       S_scan_formline(aTHX_ a)
 #define scan_heredoc(a)                S_scan_heredoc(aTHX_ a)
@@ -2630,7 +2680,9 @@
 #define filter_gets(a,b,c)     S_filter_gets(aTHX_ a,b,c)
 #define find_in_my_stash(a,b)  S_find_in_my_stash(aTHX_ a,b)
 #define new_constant(a,b,c,d,e,f)      S_new_constant(aTHX_ a,b,c,d,e,f)
+#  if defined(DEBUGGING)
 #define tokereport(a,b,c)      S_tokereport(aTHX_ a,b,c)
+#  endif
 #define ao(a)                  S_ao(aTHX_ a)
 #define depcom()               S_depcom(aTHX)
 #define incl_perldb()          S_incl_perldb(aTHX)
@@ -2648,8 +2700,11 @@
 #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
 #define isa_lookup(a,b,c,d)    S_isa_lookup(aTHX_ a,b,c,d)
 #endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
 #define stdize_locale(a)       S_stdize_locale(aTHX_ a)
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop(a,b)       S_closest_cop(aTHX_ a,b)
 #define mess_alloc()           S_mess_alloc(aTHX)
 #  if defined(LEAKTEST)
 #define xstat(a)               S_xstat(aTHX_ a)
@@ -2663,6 +2718,7 @@
 #define sv_utf8_upgrade_flags(a,b)     Perl_sv_utf8_upgrade_flags(aTHX_ a,b)
 #define sv_pvn_force_flags(a,b,c)      Perl_sv_pvn_force_flags(aTHX_ a,b,c)
 #define sv_2pv_flags(a,b,c)    Perl_sv_2pv_flags(aTHX_ a,b,c)
+#define my_atof2(a,b)          Perl_my_atof2(aTHX_ a,b)
 #define ck_anoncode(a)         Perl_ck_anoncode(aTHX_ a)
 #define ck_bitop(a)            Perl_ck_bitop(aTHX_ a)
 #define ck_concat(a)           Perl_ck_concat(aTHX_ a)
@@ -2675,7 +2731,6 @@
 #define ck_exit(a)             Perl_ck_exit(aTHX_ a)
 #define ck_ftst(a)             Perl_ck_ftst(aTHX_ a)
 #define ck_fun(a)              Perl_ck_fun(aTHX_ a)
-#define ck_fun_locale(a)       Perl_ck_fun_locale(aTHX_ a)
 #define ck_glob(a)             Perl_ck_glob(aTHX_ a)
 #define ck_grep(a)             Perl_ck_grep(aTHX_ a)
 #define ck_index(a)            Perl_ck_index(aTHX_ a)
@@ -2693,7 +2748,6 @@
 #define ck_rfun(a)             Perl_ck_rfun(aTHX_ a)
 #define ck_rvconst(a)          Perl_ck_rvconst(aTHX_ a)
 #define ck_sassign(a)          Perl_ck_sassign(aTHX_ a)
-#define ck_scmp(a)             Perl_ck_scmp(aTHX_ a)
 #define ck_select(a)           Perl_ck_select(aTHX_ a)
 #define ck_shift(a)            Perl_ck_shift(aTHX_ a)
 #define ck_sort(a)             Perl_ck_sort(aTHX_ a)
@@ -3060,11 +3114,11 @@
 #  if defined(PERL_IMPLICIT_SYS)
 #  endif
 #endif
-#if defined(MYMALLOC)
 #define malloc                 Perl_malloc
 #define calloc                 Perl_calloc
 #define realloc                        Perl_realloc
 #define mfree                  Perl_mfree
+#if defined(MYMALLOC)
 #define malloced_size          Perl_malloced_size
 #endif
 #define get_context            Perl_get_context
@@ -3146,6 +3200,8 @@
 #define block_start            Perl_block_start
 #define Perl_boot_core_UNIVERSAL       CPerlObj::Perl_boot_core_UNIVERSAL
 #define boot_core_UNIVERSAL    Perl_boot_core_UNIVERSAL
+#define Perl_boot_core_PerlIO  CPerlObj::Perl_boot_core_PerlIO
+#define boot_core_PerlIO       Perl_boot_core_PerlIO
 #define Perl_call_list         CPerlObj::Perl_call_list
 #define call_list              Perl_call_list
 #define Perl_cando             CPerlObj::Perl_cando
@@ -3614,6 +3670,10 @@
 #define localize               Perl_localize
 #define Perl_looks_like_number CPerlObj::Perl_looks_like_number
 #define looks_like_number      Perl_looks_like_number
+#define Perl_grok_number       CPerlObj::Perl_grok_number
+#define grok_number            Perl_grok_number
+#define Perl_grok_numeric_radix        CPerlObj::Perl_grok_numeric_radix
+#define grok_numeric_radix     Perl_grok_numeric_radix
 #define Perl_magic_clearenv    CPerlObj::Perl_magic_clearenv
 #define magic_clearenv         Perl_magic_clearenv
 #define Perl_magic_clear_all_env       CPerlObj::Perl_magic_clear_all_env
@@ -3758,7 +3818,7 @@
 #define my                     Perl_my
 #define Perl_my_atof           CPerlObj::Perl_my_atof
 #define my_atof                        Perl_my_atof
-#if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY)
+#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
 #define Perl_my_bcopy          CPerlObj::Perl_my_bcopy
 #define my_bcopy               Perl_my_bcopy
 #endif
@@ -3772,6 +3832,12 @@
 #define my_failure_exit                Perl_my_failure_exit
 #define Perl_my_fflush_all     CPerlObj::Perl_my_fflush_all
 #define my_fflush_all          Perl_my_fflush_all
+#define Perl_my_fork           CPerlObj::Perl_my_fork
+#define my_fork                        Perl_my_fork
+#define Perl_atfork_lock       CPerlObj::Perl_atfork_lock
+#define atfork_lock            Perl_atfork_lock
+#define Perl_atfork_unlock     CPerlObj::Perl_atfork_unlock
+#define atfork_unlock          Perl_atfork_unlock
 #define Perl_my_lstat          CPerlObj::Perl_my_lstat
 #define my_lstat               Perl_my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
@@ -4249,6 +4315,8 @@
 #endif
 #define Perl_sv_compile_2op    CPerlObj::Perl_sv_compile_2op
 #define sv_compile_2op         Perl_sv_compile_2op
+#define Perl_getcwd_sv         CPerlObj::Perl_getcwd_sv
+#define getcwd_sv              Perl_getcwd_sv
 #define Perl_sv_dec            CPerlObj::Perl_sv_dec
 #define sv_dec                 Perl_sv_dec
 #define Perl_sv_dump           CPerlObj::Perl_sv_dump
@@ -4793,12 +4861,14 @@
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
-#define S_doencodes            CPerlObj::S_doencodes
-#define doencodes              S_doencodes
 #define S_refto                        CPerlObj::S_refto
 #define refto                  S_refto
 #define S_seed                 CPerlObj::S_seed
 #define seed                   S_seed
+#endif
+#if defined(PERL_IN_PP_PACK_C) || defined(PERL_DECL_PROT)
+#define S_doencodes            CPerlObj::S_doencodes
+#define doencodes              S_doencodes
 #define S_mul128               CPerlObj::S_mul128
 #define mul128                 S_mul128
 #define S_is_an_int            CPerlObj::S_is_an_int
@@ -4887,10 +4957,12 @@
 #define regwhite               S_regwhite
 #define S_nextchar             CPerlObj::S_nextchar
 #define nextchar               S_nextchar
+#  ifdef DEBUGGING
 #define S_dumpuntil            CPerlObj::S_dumpuntil
 #define dumpuntil              S_dumpuntil
 #define S_put_byte             CPerlObj::S_put_byte
 #define put_byte               S_put_byte
+#  endif
 #define S_scan_commit          CPerlObj::S_scan_commit
 #define scan_commit            S_scan_commit
 #define S_cl_anything          CPerlObj::S_cl_anything
@@ -4947,15 +5019,35 @@
 #define find_byclass           S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#   ifdef DEBUGGING
 #define S_deb_curcv            CPerlObj::S_deb_curcv
 #define deb_curcv              S_deb_curcv
 #define S_debprof              CPerlObj::S_debprof
 #define debprof                        S_debprof
+#   endif
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define S_save_scalar_at       CPerlObj::S_save_scalar_at
 #define save_scalar_at         S_save_scalar_at
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define Perl_sharedsv_init     CPerlObj::Perl_sharedsv_init
+#define sharedsv_init          Perl_sharedsv_init
+#define Perl_sharedsv_new      CPerlObj::Perl_sharedsv_new
+#define sharedsv_new           Perl_sharedsv_new
+#define Perl_sharedsv_find     CPerlObj::Perl_sharedsv_find
+#define sharedsv_find          Perl_sharedsv_find
+#define Perl_sharedsv_lock     CPerlObj::Perl_sharedsv_lock
+#define sharedsv_lock          Perl_sharedsv_lock
+#define Perl_sharedsv_unlock   CPerlObj::Perl_sharedsv_unlock
+#define sharedsv_unlock                Perl_sharedsv_unlock
+#define Perl_sharedsv_unlock_scope     CPerlObj::Perl_sharedsv_unlock_scope
+#define sharedsv_unlock_scope  Perl_sharedsv_unlock_scope
+#define Perl_sharedsv_thrcnt_inc       CPerlObj::Perl_sharedsv_thrcnt_inc
+#define sharedsv_thrcnt_inc    Perl_sharedsv_thrcnt_inc
+#define Perl_sharedsv_thrcnt_dec       CPerlObj::Perl_sharedsv_thrcnt_dec
+#define sharedsv_thrcnt_dec    Perl_sharedsv_thrcnt_dec
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define S_asIV                 CPerlObj::S_asIV
 #define asIV                   S_asIV
@@ -5045,13 +5137,11 @@
 #define sv_add_backref         S_sv_add_backref
 #define S_sv_del_backref       CPerlObj::S_sv_del_backref
 #define sv_del_backref         S_sv_del_backref
-#  if defined(DEBUGGING)
+#  ifdef DEBUGGING
 #define S_del_sv               CPerlObj::S_del_sv
 #define del_sv                 S_del_sv
 #  endif
 #  if !defined(NV_PRESERVES_UV)
-#define S_sv_2inuv_non_preserve        CPerlObj::S_sv_2inuv_non_preserve
-#define sv_2inuv_non_preserve  S_sv_2inuv_non_preserve
 #define S_sv_2iuv_non_preserve CPerlObj::S_sv_2iuv_non_preserve
 #define sv_2iuv_non_preserve   S_sv_2iuv_non_preserve
 #  endif
@@ -5073,6 +5163,8 @@
 #define force_word             S_force_word
 #define S_tokeq                        CPerlObj::S_tokeq
 #define tokeq                  S_tokeq
+#define S_pending_ident                CPerlObj::S_pending_ident
+#define pending_ident          S_pending_ident
 #define S_scan_const           CPerlObj::S_scan_const
 #define scan_const             S_scan_const
 #define S_scan_formline                CPerlObj::S_scan_formline
@@ -5127,8 +5219,10 @@
 #define find_in_my_stash       S_find_in_my_stash
 #define S_new_constant         CPerlObj::S_new_constant
 #define new_constant           S_new_constant
+#  if defined(DEBUGGING)
 #define S_tokereport           CPerlObj::S_tokereport
 #define tokereport             S_tokereport
+#  endif
 #define S_ao                   CPerlObj::S_ao
 #define ao                     S_ao
 #define S_depcom               CPerlObj::S_depcom
@@ -5154,9 +5248,13 @@
 #define S_isa_lookup           CPerlObj::S_isa_lookup
 #define isa_lookup             S_isa_lookup
 #endif
-#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
 #define S_stdize_locale                CPerlObj::S_stdize_locale
 #define stdize_locale          S_stdize_locale
+#endif
+#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define S_closest_cop          CPerlObj::S_closest_cop
+#define closest_cop            S_closest_cop
 #define S_mess_alloc           CPerlObj::S_mess_alloc
 #define mess_alloc             S_mess_alloc
 #  if defined(LEAKTEST)
@@ -5178,6 +5276,8 @@
 #define sv_pvn_force_flags     Perl_sv_pvn_force_flags
 #define Perl_sv_2pv_flags      CPerlObj::Perl_sv_2pv_flags
 #define sv_2pv_flags           Perl_sv_2pv_flags
+#define Perl_my_atof2          CPerlObj::Perl_my_atof2
+#define my_atof2               Perl_my_atof2
 #define Perl_ck_anoncode       CPerlObj::Perl_ck_anoncode
 #define ck_anoncode            Perl_ck_anoncode
 #define Perl_ck_bitop          CPerlObj::Perl_ck_bitop
@@ -5202,8 +5302,6 @@
 #define ck_ftst                        Perl_ck_ftst
 #define Perl_ck_fun            CPerlObj::Perl_ck_fun
 #define ck_fun                 Perl_ck_fun
-#define Perl_ck_fun_locale     CPerlObj::Perl_ck_fun_locale
-#define ck_fun_locale          Perl_ck_fun_locale
 #define Perl_ck_glob           CPerlObj::Perl_ck_glob
 #define ck_glob                        Perl_ck_glob
 #define Perl_ck_grep           CPerlObj::Perl_ck_grep
@@ -5238,8 +5336,6 @@
 #define ck_rvconst             Perl_ck_rvconst
 #define Perl_ck_sassign                CPerlObj::Perl_ck_sassign
 #define ck_sassign             Perl_ck_sassign
-#define Perl_ck_scmp           CPerlObj::Perl_ck_scmp
-#define ck_scmp                        Perl_ck_scmp
 #define Perl_ck_select         CPerlObj::Perl_ck_select
 #define ck_select              Perl_ck_select
 #define Perl_ck_shift          CPerlObj::Perl_ck_shift