Cures for _57 in AIX 4.1.5.0.

(1) The lddlflags lost its -lc by change #3660
    (and the politeness of change #3257).
(2) optype_size must end up in perl.exp (as PL_optype_size).
    Added it to perlvars.h, fixed bytecode.pl,
    regen'ed the relevant headers.

p4raw-link: @3660 (not found)
p4raw-link: @3257 on //depot/cfgperl: 5f3774a9b49fbaa1b06fec2cad77079ee509d6ca

p4raw-id: //depot/cfgperl@3479

diff --git a/bytecode.h b/bytecode.h
index 9f4f781..b08dc7c 100644 (file)
--- a/bytecode.h
+++ b/bytecode.h
@@ -134,7 +134,7 @@ typedef IV IV64;
        ((PMOP*)o)->op_pmregexp = arg ? \
                CALLREGCOMP(arg, arg + PL_bytecode_pv.xpv_cur, ((PMOP*)o)) : 0
 #define BSET_newsv(sv, arg)    sv = NEWSV(666,0); SvUPGRADE(sv, arg)
-#define BSET_newop(o, arg)     o = (OP*)safemalloc(optype_size[arg])
+#define BSET_newop(o, arg)     o = (OP*)safemalloc(PL_optype_size[arg])
 #define BSET_newopn(o, arg) STMT_START {       \
        OP *oldop = o;                          \
        BSET_newop(o, arg);                     \

diff --git a/bytecode.pl b/bytecode.pl
index f53b0ce..704d3b1 100644 (file)
--- a/bytecode.pl
+++ b/bytecode.pl
@@ -198,7 +198,7 @@ for ($i = 0; $i < @optype - 1; $i++) {
 }
 printf BYTERUN_H "    OPt_%s\t\t/* %d */\n};\n\n", $optype[$i], $i;
 print BYTERUN_H <<'EOT';
-EXT int optype_size[]
+EXT int PL_optype_size[]
 #ifdef DOINIT
 = {
 EOT

diff --git a/byterun.h b/byterun.h
index 3aac6fa..160913f 100644 (file)
--- a/byterun.h
+++ b/byterun.h
@@ -156,7 +156,7 @@ enum {
     OPt_COP            /* 11 */
 };
 
-EXT int optype_size[]
+EXT int PL_optype_size[]
 #ifdef DOINIT
 = {
     sizeof(OP),

diff --git a/embedvar.h b/embedvar.h
index 73c674c..41a566f 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -757,6 +757,7 @@
 #define PL_oldbufptr           (PL_Vars.Goldbufptr)
 #define PL_oldoldbufptr                (PL_Vars.Goldoldbufptr)
 #define PL_op_seqmax           (PL_Vars.Gop_seqmax)
+#define PL_optype_size         (PL_Vars.Goptype_size)
 #define PL_origalen            (PL_Vars.Gorigalen)
 #define PL_origenviron         (PL_Vars.Gorigenviron)
 #define PL_osname              (PL_Vars.Gosname)
@@ -896,6 +897,7 @@
 #define PL_Goldbufptr          PL_oldbufptr
 #define PL_Goldoldbufptr       PL_oldoldbufptr
 #define PL_Gop_seqmax          PL_op_seqmax
+#define PL_Goptype_size                PL_optype_size
 #define PL_Gorigalen           PL_origalen
 #define PL_Gorigenviron                PL_origenviron
 #define PL_Gosname             PL_osname

diff --git a/objXSUB.h b/objXSUB.h
index 658e5ce..e4f90ab 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -442,6 +442,8 @@
 #define PL_op_seqmax           pPerl->PL_op_seqmax
 #undef  PL_opsave
 #define PL_opsave              pPerl->PL_opsave
+#undef  PL_optype_size
+#define PL_optype_size         pPerl->PL_optype_size
 #undef  PL_origalen
 #define PL_origalen            pPerl->PL_origalen
 #undef  PL_origargc

diff --git a/perlvars.h b/perlvars.h
index 67dc7c1..061f8f3 100644 (file)
--- a/perlvars.h
+++ b/perlvars.h
@@ -204,3 +204,6 @@ PERLVAR(Guudmap[256],       char)
 PERLVAR(Gbitcount,     char *)
 PERLVAR(Gfilter_debug, int)
 
+/* byterun globals */
+PERLVAR(Goptype_size[], int)
+