Merge SVN 4992

ChangeLog

@@ -3,6 +3,10 @@
 
 	* configure.ac: Add check for sys/time.h
 
+2023-02-19  Simon Sobisch <[email protected]>
+
+	* configure.ac: minor adjustment for bdb library lookup
+
 2023-02-10  Simon Sobisch <[email protected]>
 
 	* configure.ac: fixed adjusted hack for AIX 64bit OBJECT_MODE

cobc/ChangeLog

@@ -40,15 +40,17 @@
 	* typeck.c: Check for small integer for add/subtruct and use
 			cob_add_int/cob_sub_int as the speed in this case was improved
 
-2022-02-20  Fabrice Le Fessant <[email protected]>
+2023-02-21  Simon Sobisch <[email protected]>
 
-	* scanner.l (read_literal): refactor to use `enum cb_literal_type`
-	  instead of a char* for the type of literal
+	* codegen.c, flag.def [COBC_HAS_CUTOFF_FLAG]: fix compile errors,
+	  output -fif-cutoff to help when available
 
 2023-02-20  Fabrice Le Fessant <[email protected]>
 
-	* pplex.l: allow REPLACE between Gcos `CONTROL DIVISION` and
-	  the`IDENTIFICATION DIVISION`
+	* scanner.l (read_literal): refactor to use enum cb_literal_type
+	  instead of a char* for the type of literal
+	* pplex.l: allow REPLACE between Gcos CONTROL DIVISION and
+	  the IDENTIFICATION DIVISION
 
 2023-02-19  Ron Norman <[email protected]>
 

cobc/typeck.c

@@ -8278,8 +8278,8 @@ cb_emit_accept (cb_tree var, cb_tree pos, struct cb_attr_struct *attr_ptr)
 	}
 
 #if	0	/* RXWRXW - Screen */
-	if ((CB_REF_OR_FIELD_P (var)) &&
-	     CB_FIELD (cb_ref (var))->storage == CB_STORAGE_SCREEN) {
+	if (CB_REF_OR_FIELD_P (var)
+	 && CB_FIELD_PTR (var)->storage == CB_STORAGE_SCREEN) {
 		current_program->flag_screen = 1;
 	}
 #endif
@@ -8293,7 +8293,7 @@ cb_emit_accept (cb_tree var, cb_tree pos, struct cb_attr_struct *attr_ptr)
 				cobc_xref_set_receiving (current_program->crt_status);
 			}
 		}
-		if ((CB_REF_OR_FIELD_P (var))
+		if (CB_REF_OR_FIELD_P (var)
 		 && CB_FIELD_PTR (var)->storage == CB_STORAGE_SCREEN) {
 			output_screen_from (CB_FIELD_PTR (var), 0);
 			gen_screen_ptr = 1;

config/ChangeLog

@@ -4,6 +4,11 @@
 	* runtime.cfg: dropped not available "varfix_format",
 	  see "fixrel_format" instead; minor reformatting/rewording
 
+2023-02-21  Simon Sobisch <[email protected]>
+
+	* rm-strict.conf: enable indirect-redefines as this was added
+	  with later RM-COBOL versions
+
 2023-02-16  Fabrice Le Fessant <[email protected]>
 
 	* gcos.words: remove alias VALUES=VALUE, to correctly parse

config/rm-strict.conf

@@ -1,6 +1,6 @@
 # GnuCOBOL compiler configuration
 #
-# Copyright (C) 2001-2012, 2014-2022 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012, 2014-2023 Free Software Foundation, Inc.
 # Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart,
 # Ron Norman
 #
@@ -74,7 +74,7 @@ odoslide:			no
 keycompress:			0
 
 # Allow REDEFINES to other than last equal level number
-indirect-redefines:		no
+indirect-redefines:		yes		# "restriction removed in version 12+"
 
 # Binary byte size - defines the allocated bytes according to PIC
 # Value:         signed  unsigned  bytes

config/runtime.cfg

@@ -1,6 +1,6 @@
 # GnuCOBOL runtime configuration
 #
-# Copyright (C) 2015-2022,2024 Free Software Foundation, Inc.
+# Copyright (C) 2015-2024 Free Software Foundation, Inc.
 # Written by Simon Sobisch, Ron Norman
 #
 # This file is part of the GnuCOBOL runtime.
@@ -702,7 +702,8 @@
 # Environment name:  COB_LEGACY
 #   Parameter name:  legacy
 #          Purpose:  keep behavior of former runtime versions, currently only
-#                    for setting screen attributes for non input fields
+#                    for setting screen attributes for non input fields and
+#                    disabling blinking on some systems
 #             Type:  boolean
 #          Default:  not set
 #          Example:  legacy true

configure.ac

@@ -1873,16 +1873,16 @@ if test "$with_db" = "yes" -o "$with_db" = "check"; then
 			}
 			return 1;]])],
 			[AC_DEFINE([WITH_DB], [1])
-			cob_gen_bdb=yes
-			break],
+			cob_gen_bdb=yes],
 			[],
 			[])
 		else
 			AC_MSG_CHECKING([for Berkeley DB library with version $COB_BDB_HEADER])
 			# prefer library with version number included as some systems link against wrong version
 			# of the library and to not break when a newer BDB version is installed, see bug #100
 			COB_BDB_HEADER_CLEAN=$(echo "$COB_BDB_HEADER" | sed -e 's/\.//' -e 's/\-//')
-			for cobdb in db-$COB_BDB_HEADER db-$COB_BDB_HEADER_CLEAN db \
+			for cobdb in db-$COB_BDB_HEADER db-$COB_BDB_HEADER_CLEAN db$COB_BDB_HEADER_CLEAN \
+				db-$COB_BDB_HEADER_MAJOR db$COB_BDB_HEADER_MAJOR db \
 				libdb$COB_BDB_HEADER libdb$COB_BDB_HEADER_CLEAN  # for common Win32 versions...
 			do
 				LIBS="$test_libs -l$cobdb"
@@ -1931,6 +1931,8 @@ if test "$with_db" = "yes" -o "$with_db" = "check"; then
 		fi
 	fi
 	unset COB_BDB_HEADER
+	unset COB_BDB_HEADER_MAJOR
+	unset COB_BDB_HEADER_MINOR
 	LIBS="$curr_libs"
 fi