Merge remote-tracking branch 'upstream/gnucobol-3.x' into gcos4gnucob…

…ol-3.x

cobc/ChangeLog

@@ -1,4 +1,8 @@
 
+2024-06-19  David Declerck <[email protected]>
+
+	* cobc.c (process_compile): fix MSVC build command
+
 2024-05-15  Simon Sobisch <[email protected]>
 
 	* replace.c: fix compile warnings and formatting

cobc/cobc.c

@@ -8217,7 +8217,7 @@ process_compile (struct filename *fn)
 		"%s /c %s %s /Od /MDd /Zi /FR /c /Fa\"%s\" /Fo\"%s\" \"%s\"" :
 		"%s /c %s %s     /MD          /c /Fa\"%s\" /Fo\"%s\" \"%s\"",
 			cobc_cc, cobc_cflags, cobc_include, name,
-			name, fn->translate);
+			fn->object, fn->translate);
 	if (verbose_output > 1) {
 		return process (cobc_buffer);
 	} else {

tests/ChangeLog

@@ -1,4 +1,8 @@
 
+2024-06-19  David Declerck <[email protected]>
+
+	* atlocal_win: fix path-related issues in Windows builds
+
 2023-07-10  Simon Sobisch <[email protected]>
 
 	* atlocal_win: updated to current atlocal.in
@@ -38,11 +42,6 @@
 	* testsuite.src/run_misc.at: fix linking/dlopen issue happening
 	  on some systems (mostly win32) in test CALL RETURNING POINTER
 
-2023-01-23 David Declerck <[email protected]>
-
-	* testsuite.src/configuration.at: test reading translation
-	  tables from an external file
-
 2022-12-08  Simon Sobisch <[email protected]>
 
 	* atlocal.in, atlocal_win, atlocal_valgrind: added COB_MODULE_EXT
@@ -84,16 +83,6 @@
 
 	* atlocal_valgrind, atlocal_win: updated to match atlocal.in
 
-2022-07-19  Nicolas Berthier <[email protected]>
-
-	* testsuite.src/general: fix area A in testsuite
-
-2022-03-29  Nicolas Berthier <[email protected]>
-
-	* testsuite.src/configuration.at, testsuite.at/syn_misc.at: new
-	  tests for sections and paragraphs that do not end with a period
-	* testsuite.src/run_misc.at: fix lines in trace test
-
 2022-07-28  Simon Sobisch <[email protected]>
 
 	* atlocal.in: option to run part of the testsuite via perf -stat
@@ -103,15 +92,6 @@
 	  run_prog_manual.sh where used
 	* testsuite.src: added missing $COBCRUN_DIRECT
 
-2022-03-29  Nicolas Berthier <[email protected]>
-
-	* testsuite.src/syn_copy.at: test partial replacing with SPACES
-	  figurative constant
-
-2022-01-25  Nicolas Berthier <[email protected]>
-
-	* testsuite.src/syn_copy.at: test partial replacing with literal
-
 2022-02-10  Simon Sobisch <[email protected]>
 
 	* testsuite_manual.at [MANUAL_CHECK]: new macro for running every

tests/atlocal_win

@@ -88,8 +88,8 @@ _unset_option () {
 _return_path () {
 	# For later reference only
 	#echo "$1" | sed 's/\//\\/g' | sed 's/^\\\([a-z]\)\\/\1:\\/g')
-	if test "$OSTYPE" = "cygwin"; then
-		cygpath -pw "$1"
+	if test "$OSTYPE" = "cygwin" -o x$MSYSTEM_CHOST != x; then
+		cygpath -pm "$1"
 	else
 		# check for WSL / Bash on Windows; ignore error messages (file not available)
 		if $(grep -q "Microsoft" /proc/sys/kernel/osrelease 2>/dev/null); then