integrate cfgperl contents into mainline; merge conflicts

p4raw-id: //depot/perl@4475

diff --cc iperlsys.h
Simple merge

diff --cc perl.h
index b8d0dd8,244c339..0370634
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
@@@ -1564,6 -1567,6 +1567,10 @@@ typedef union any ANY
  #  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
  #endif
  
++#ifndef PERL_SYS_INIT3
++#  define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp)
++#endif
++
  #ifndef MAXPATHLEN
  #  ifdef PATH_MAX
  #    ifdef _POSIX_PATH_MAX

diff --cc regcomp.c
index b522077,231235c..2d69750
--- 1/regcomp.c
--- 2/regcomp.c
+++ b/regcomp.c
@@@ -2292,8 -2297,7 +2297,7 @@@ STATIC regnode 
  S_regclass(pTHX)
  {
      dTHR;
-     register char *opnd, *s;
 -    register I32 value;
 +    register UV value;
      register I32 lastvalue = OOB_CHAR8;
      register I32 range = 0;
      register regnode *ret;
@@@ -2711,8 -2724,8 +2724,8 @@@ STATIC regnode 
  S_regclassutf8(pTHX)
  {
      dTHR;
-     register char *opnd, *e;
+     register char *e;
 -    register U32 value;
 +    register UV value;
      register U32 lastvalue = OOB_UTF8;
      register I32 range = 0;
      register regnode *ret;