Use both cache entries for Perl_sv_pos_b2u().

[perl5.git] / vms / genconfig.pl

diff --git a/vms/genconfig.pl b/vms/genconfig.pl
index 45f50ca..6e9df70 100644 (file)
--- a/vms/genconfig.pl
+++ b/vms/genconfig.pl
@@ -140,7 +140,14 @@ foreach (@ARGV) {
       $d_attr = 'undef';
     }
     print OUT "vms_cc_type='$cctype'\n";
-    print OUT "d_attribut='$d_attr'\n";
+    print OUT "d_attribute_format='$d_attr'\n";
+    # XXX The following attributes may be able to use $d_attr, too.
+    print OUT "d_attribute_malloc='undef'\n";
+    print OUT "d_attribute_nonnull='undef'\n";
+    print OUT "d_attribute_noreturn='undef'\n";
+    print OUT "d_attribute_pure='undef'\n";
+    print OUT "d_attribute_unused='undef'\n";
+    print OUT "d_attribute_warn_unused_result='undef'\n";
     print OUT "cc='$cc'\n";
     if ( ($cctype eq 'decc' and $archsufx eq 'VAX') || $cctype eq 'gcc') {
       # gcc and DECC for VAX requires filename in /object qualifier, so we
@@ -157,8 +164,8 @@ foreach (@ARGV) {
       $optimize = $qual;
       $ccflags =~ s/$qual//;
     }
-    $usethreads = ($ccflags =~ m!/DEF[^/]+USE_THREADS!i and
-                   $ccflags !~ m!/UND[^/]+USE_THREADS!i);
+    $usethreads = ($ccflags =~ m!/DEF[^/]+USE_5005THREADS!i and
+                   $ccflags !~ m!/UND[^/]+USE_5005THREADS!i);
     print OUT "usethreads='",($usethreads ? 'define' : 'undef'),"'\n";;
     $optimize = "$debug$optimize";
     print OUT "ccflags='$ccflags'\n";
@@ -229,6 +236,8 @@ foreach (@ARGV) {
                  d_wcstombs d_wctomb d_mblen d_mktime d_strcoll d_strxfrm ]) {
       print OUT "$_='$rtlhas'\n";
     }
+    print OUT "d_stdio_ptr_lval_sets_cnt='undef'\n";
+    print OUT "d_stdio_ptr_lval_nochange_cnt='undef'\n";
     foreach (qw[ d_gettimeod d_uname d_truncate d_wait4 d_index
                  d_pathconf d_fpathconf d_sysconf d_sigsetjmp ]) {
       print OUT "$_='$rtlnew'\n";
@@ -365,8 +374,8 @@ close IN;
 # as the manifest for the obsolete variable $d_eunice.
 print OUT "d_eunice='undef'\n";  delete $pp_vars{VMS};
 
-# XXX temporary -- USE_THREADS is currently on CC command line
-delete $pp_vars{'USE_THREADS'};
+# XXX temporary -- USE_5005THREADS is currently on CC command line
+delete $pp_vars{'USE_5005THREADS'};
 
 foreach (sort keys %pp_vars) {
   warn "Didn't see $_ in $infile\n";
@@ -391,8 +400,14 @@ else { warn "Can't read ${outdir}crtl.opt - skipping 'libs' & 'libc'"; }
 
 if (open(PL,"${outdir}patchlevel.h")) {
   while (<PL>) {
-    if    (/^#define PATCHLEVEL\s+(\S+)/) { print OUT "PATCHLEVEL='$1'\n"; }
-    elsif (/^#define SUBVERSION\s+(\S+)/) { print OUT "SUBVERSION='$1'\n"; }
+    if    (/^#define PERL_VERSION\s+(\S+)/) {
+      print OUT "PERL_VERSION='$1'\n";
+      print OUT "PATCHLEVEL='$1'\n";   # XXX compat
+    }
+    elsif (/^#define PERL_SUBVERSION\s+(\S+)/) {
+      print OUT "PERL_SUBVERSION='$1'\n";
+      print OUT "SUBVERSION='$1'\n";   # XXX compat
+    }
   }
   close PL;
 }