[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5587-ge1d847b0

[John Malmberg]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.3-stable has been updated
       via  e1d847b024480749c67a3561d52f5bc178c81144 (commit)
      from  2ff7df3d79f5801c90af79643e743efc36d2c6e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=e1d847b024480749c67a3561d52f5bc178c81144

commit e1d847b024480749c67a3561d52f5bc178c81144
Author: John E. Malmberg <wb8tyw@qsl.net>
Date:   Wed Jan 1 15:45:05 2025 -0600

    Add buiding OpenVMS 9.2-2 X86_64

diff --git a/vms/ChangeLog b/vms/ChangeLog
index 228ae998..be1a8543 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,13 @@
+2025-01-01         John E. Malmberg      <wb8tyw@qsl.net>
+
+       First build on OpenVMS 9.2-2 x86_64
+       * descrip.mms: Work around MMS 4.0 bugs.
+       * generate_config_vms_h_gawk.com: Changes for V9.2-2
+       * pcsi_product_gawk.com: Support MMS if MMK not present
+       * make_pcsi_gawk_kit_name.com: Support x86_64 hardware
+       * vmstest.com: Fix colontest, skip profile2 for VMS bug.
+       * vms_fwrite: Fix alloca define conflict
+
 2024-12-15         Arnold D. Robbins     <arnold@skeeve.com>
 
        * vms_misc.c, vms_popen.c: Adjust calls of emalloc().
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 90be7dfa..0e3806ed 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -138,10 +138,10 @@ all : gawk gawk_debug
 
 # dummy target to allow building "gawk" in addition to explicit "gawk.exe"
 gawk : gawk.exe
-      @        $(ECHO) "$< is upto date"
+      @        $(ECHO) "$< is up to date"
 
 gawk_debug : gawk_debug.exe
-      @        $(ECHO) "$< is upto date"
+      @        $(ECHO) "$< is up to date"
 
 # rules to build gawk
 gawk.exe : $(GAWKOBJ) $(AWKOBJS) $(VMSOBJS) gawk.opt
@@ -182,15 +182,17 @@ command.obj       : command.c cmd.h
 debug.obj      : debug.c cmd.h
 dfa.obj                : $(SUPPORT)dfa.c $(SUPPORT)dfa.h
 
+# MMS 4.O gets MMS$SOURCE wrong here
 dynarrray_resize.obj : $(MALLOC)dynarray_resize.c $(MALLOC)dynarray.h
     $define/user malloc $(MALLOC)
-    $(CC)$(CEFLAGS)/define=(HAVE_CONFIG_H)/object=$(MMS$TARGET) $(MMS$SOURCE)
+    $(CC)$(CEFLAGS)/define=(HAVE_CONFIG_H)/object=$(MMS$TARGET) \
+      $(MALLOC)dynarray_resize.c
 
 ext.obj                : ext.c
 eval.obj       : eval.c
 field.obj      : field.c
 floatcomp.obj  : floatcomp.c
-gawkaoi.obj    : gawkapi.c
+gawkapi.obj    : gawkapi.c
 gawkmisc.obj   : gawkmisc.c $(VMSDIR)gawkmisc.vms
 getopt.obj     : $(SUPPORT)getopt.c
 getopt1.obj    : $(SUPPORT)getopt1.c
@@ -206,12 +208,14 @@ profile.obj       : profile.c
 random.obj     : $(SUPPORT)random.c $(SUPPORT)random.h
 re.obj         : re.c
 
+# MMS 4.O gets MMS$SOURCE wrong here
 regex.obj      : $(SUPPORT)regex.c $(SUPPORT)regcomp.c \
                  $(SUPPORT)regex_internal.c $(SUPPORT)regexec.c \
                  $(SUPPORT)regex.h $(SUPPORT)regex_internal.h \
                   $(MALLOC)dynarray.h
     $define/user malloc $(MALLOC)
-    $(CC)$(CEFLAGS)/define=(HAVE_CONFIG_H)/object=$(MMS$TARGET) $(MMS$SOURCE)
+    $(CC)$(CEFLAGS)/define=(HAVE_CONFIG_H)/object=$(MMS$TARGET) \
+      $(SUPPORT)regex.c
 
 str_array.obj  : str_array.c
 symbol.obj     : symbol.c
@@ -283,6 +287,7 @@ ext_gawkdirfd_h = [.extension]gawkdirfd.h config.h 
nonposix.h
 
 extensions : filefuncs.exe fnmatch.exe inplace.exe ordchr.exe readdir.exe \
        revoutput.exe revtwoway.exe rwarray.exe testext.exe time.exe
+        @ write sys$output "$< are up to date"
 
 filefuncs.exe : filefuncs.obj stack.obj gawkfts.obj $(plug_opt)
        link/share=$(MMS$TARGET) $(MMS$SOURCE), stack.obj, gawkfts.obj, \
diff --git a/vms/generate_config_vms_h_gawk.com 
b/vms/generate_config_vms_h_gawk.com
index d71500f7..f8fd0473 100755
--- a/vms/generate_config_vms_h_gawk.com
+++ b/vms/generate_config_vms_h_gawk.com
@@ -13,10 +13,10 @@ $! This generates a []config.h file and also a config_vms.h 
file,
 $! which is used to supplement that file.
 $!
 $!
-$! Copyright (C) 2014, 2016, 2019, 2023 the Free Software Foundation, Inc.
+$! Copyright (C) 2014, 2016, 2019, 2023, 2024 the Free Software Foundation, 
Inc.
 $!
 $! This file is part of GAWK, the GNU implementation of the
-$! AWK Progamming Language.
+$! AWK Programming Language.
 $!
 $! GAWK is free software; you can redistribute it and/or modify
 $! it under the terms of the GNU General Public License as published by
@@ -51,7 +51,8 @@ $ args_lower = f$edit(args, "LOWERCASE")
 $!
 $ args_len = f$length(args)
 $!
-$ if (f$getsyi("HW_MODEL") .lt. 1024)
+$ hw_model = f$getsyi("HW_MODEL")
+$ if hw_model .gt 0 .and. hw_model .lt. 1024
 $ then
 $   arch_name = "VAX"
 $ else
@@ -162,7 +163,7 @@ $!
 $! This stuff seems needed for VMS 7.3 and earlier, but not VMS 8.2+
 $! Need some more data as to which versions these issues are fixed in.
 $ write cvh "#if __VMS_VER <= 80200000"
-$! mkstemp goes into an infinte loop in gawk in VAX/VMS 7.3
+$! mkstemp goes into an infinite loop in gawk in VAX/VMS 7.3
 $ write cvh "#ifdef HAVE_MKSTEMP"
 $ write cvh "#undef HAVE_MKSTEMP"
 $ write cvh "#endif"
@@ -320,6 +321,10 @@ $ write cvh "}"
 $ write cvh ""
 $ write cvh "#define TIME_T_UNSIGNED 1"
 $ write cvh "#include ""custom.h"""
+$ write cvh "/* TEMP Fixup for V9.2-2 termios header not compatible */"
+$ write cvh "#ifdef HAVE_TERMIOS_H"
+$ write cvh "#undef HAVE_TERMIOS_H"
+$ write cvh "#endif"
 $ write cvh ""
 $
 $!
diff --git a/vms/make_pcsi_gawk_kit_name.com b/vms/make_pcsi_gawk_kit_name.com
index daaa37a4..495b356f 100644
--- a/vms/make_pcsi_gawk_kit_name.com
+++ b/vms/make_pcsi_gawk_kit_name.com
@@ -59,6 +59,7 @@ $code = f$extract(0, 1, arch_type)
 $if (code .eqs. "I") then base = "I64VMS"
 $if (code .eqs. "V") then base = "VAXVMS"
 $if (code .eqs. "A") then base = "AXPVMS"
+$if (code .eqs. "x") then base = "X86VMS"
 $!
 $!
 $product = "gawk"
diff --git a/vms/pcsi_product_gawk.com b/vms/pcsi_product_gawk.com
index b0fc50f8..e7abb052 100644
--- a/vms/pcsi_product_gawk.com
+++ b/vms/pcsi_product_gawk.com
@@ -13,8 +13,8 @@ $!
 $! Put things back on error.
 $ on warning then goto all_exit
 $!
-$ arch_type = f$getsyi("ARCH_NAME")
-$ arch_code = f$extract(0, 1, arch_type)
+$ arch_name = f$getsyi("ARCH_NAME")
+$ arch_code = f$extract(0, 1, arch_name)
 $!
 $ can_build = 1
 $ producer = f$trnlnm("GNV_PCSI_PRODUCER")
@@ -43,18 +43,26 @@ $   write sys$output "Not able to build a kit."
 $   goto all_exit
 $ endif
 $!
+$! Prefer MMK over MMS
+$ if f$type(mmk) .eqs. "STRING"
+$ then
+$   mms :== 'mmk'
+$ else
+$!  mms needs a little help
+$   __'arch_name'__ == "TRUE"
+$ endif
 $!
 $! Build the gawk image(s)
 $!-------------------------
 $ if f$search("gawk.exe") .eqs. ""
 $ then
-$   mmk/descrip=[.vms]descrip.mms gawk
+$   mms/descrip=[.vms]descrip.mms gawk
 $ endif
 $ if arch_code .nes. "V"
 $ then
 $   if f$search("filefuncs.exe") .eqs. ""
 $   then
-$       mmk/descrip=[.vms]descrip.mms extensions
+$       mms/descrip=[.vms]descrip.mms extensions
 $   endif
 $ endif
 $!
@@ -93,12 +101,6 @@ $! Regenerate the PCSI Text file.
 $!---------------------------------
 $ @[.vms]build_gawk_pcsi_text.com
 $!
-$ base = ""
-$ arch_name = f$edit(f$getsyi("arch_name"),"UPCASE")
-$ if arch_name .eqs. "ALPHA" then base = "AXPVMS"
-$ if arch_name .eqs. "IA64" then base = "I64VMS"
-$ if arch_name .eqs. "VAX" then base = "VAXVMS"
-$!
 $!
 $! Parse the kit name into components.
 $!---------------------------------------
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 9e932e5c..16b8ea30 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -753,10 +753,21 @@ $ return
 $
 $colonwarn:    echo "''test'"
 $      test_class = "gawk_ext"
+$   if f$search("sys$disk:[]_''test'*.tmp;*") .nes. ""
+$   then
+$       rm _'test'*.tmp;*
+$   endif
+$   if f$search("sys$disk:[]_''test'*.err;*") .nes. ""
+$   then
+$       rm _'test'*.err;*
+$   endif
+$   define/user sys$error _'test'.err
 $      gawk -f 'test'.awk 1 < 'test'.in > _'test'.tmp
+$   define/user sys$error _'test'_2.err
 $      gawk -f 'test'.awk 2 < 'test'.in > _'test'_2.tmp
+$   define/user sys$error _'test'_3.err
 $      gawk -f 'test'.awk 3 < 'test'.in > _'test'_3.tmp
-$      if f$search("sys$disk:[]_''test'_%.tmp;2") .nes. ""
+$      if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
 $      then
 $          delete sys$disk:[]_'test'_%.tmp;2
 $      endif
@@ -764,11 +775,16 @@ $ if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
 $      then
 $          delete sys$disk:[]_'test'.tmp;2
 $      endif
-$      append _'test'_2.tmp,_'test'_3.tmp _'test'.tmp
-$      cmp 'test'.ok sys$disk:[]_'test'.tmp;1
+$      append -
+       sys$disk:[]_'test'.tmp,sys$disk:[]_'test'.err,-
+          sys$disk:[]_'test'_2.tmp,sys$disk:[]_'test'_2.err,-
+          sys$disk:[]_'test'_3.tmp -
+          _'test'_3.err
+$      cmp 'test'.ok sys$disk:[]_'test'.err;1
 $      if $status
 $      then
 $          rm _'test'*.tmp;*
+$          rm _'test'*.err;*
 $          gosub junit_report_pass
 $      else
 $          gosub junit_report_fail_diff
@@ -3770,6 +3786,10 @@ $profile2:  echo "''test'"
 $      test_class = "gawk_ext"
 $      gawk --profile -v "sortcmd=SORT sys$input: sys$output:" -
                        -f xref.awk dtdgport.awk > _NL:
+$!  Test passes, but verification failing.
+$   skip_reason = "Verification bug in VMS 9.2-2 edit/sum access violation
+$   gosub junit_report_skip
+$   return
 $      ! sed <awkprof.out 1,2d >_profile2.tmp
 $      sumslp awkprof.out /update=sys$input: /output=_'test'.tmp
 -1,2

-----------------------------------------------------------------------

Summary of changes:
 vms/ChangeLog                      | 10 ++++++++++
 vms/descrip.mms                    | 15 ++++++++++-----
 vms/generate_config_vms_h_gawk.com | 13 +++++++++----
 vms/make_pcsi_gawk_kit_name.com    |  1 +
 vms/pcsi_product_gawk.com          | 22 ++++++++++++----------
 vms/vmstest.com                    | 26 +++++++++++++++++++++++---
 6 files changed, 65 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
gawk