From: Kito Cheng <kito.cheng@sifive.com>
Date: Mon, 2 Oct 2023 02:50:42 +0000 (+0800)
Subject: options: Prevent multidimensional arrays [PR111664]
X-Git-Tag: basepoints/gcc-15~5744
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=027a94cf32be0b53d163e252e3c9e4800ad8f5f4;p=thirdparty%2Fgcc.git

options: Prevent multidimensional arrays [PR111664]

Multidimensional arrary is gawk extension, and we accidentally
introduced that in recent commit[1].

[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e4a4b8e983bac865eb435b11798e38d633b98942

gcc/ChangeLog:

	PR bootstrap/111664
	* opt-read.awk: Drop multidimensional arrays.
	* opth-gen.awk: Ditto.
---

diff --git a/gcc/opt-read.awk b/gcc/opt-read.awk
index fcf928539574..f74d8478f728 100644
--- a/gcc/opt-read.awk
+++ b/gcc/opt-read.awk
@@ -123,7 +123,7 @@ BEGIN {
 			}
 			else {
 				target_var = opt_args("Var", $0)
-                                if (target_var)
+				if (target_var)
 				{
 					target_var = opt_args("Var", $1)
 					var_index = find_index(target_var, target_vars, n_target_vars)
@@ -131,7 +131,7 @@ BEGIN {
 					{
 						target_vars[n_target_vars++] = target_var
 					}
-					other_masks[var_index][n_other_mask[var_index]++] = name
+					other_masks[var_index "," n_other_mask[var_index]++] = name
 				}
 				else
 				{
diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index 70ca3d377192..c4398be2f3ae 100644
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -412,9 +412,9 @@ for (i = 0; i < n_target_vars; i++)
 		continue
 	for (j = 0; j < n_other_mask[i]; j++)
 	{
-		print "#define MASK_" other_masks[i][j] " (1U << " other_masknum[i][""]++ ")"
+		print "#define MASK_" other_masks[i "," j] " (1U << " other_masknum[i]++ ")"
 	}
-	if (other_masknum[i][""] > 32)
+	if (other_masknum[i] > 32)
 		print "#error too many target masks for" extra_target_vars[i]
 }
 
@@ -437,8 +437,8 @@ for (i = 0; i < n_target_vars; i++)
 		continue
 	for (j = 0; j < n_other_mask[i]; j++)
 	{
-		print "#define TARGET_" other_masks[i][j] \
-		      " ((" target_vars[i] " & MASK_" other_masks[i][j] ") != 0)"
+		print "#define TARGET_" other_masks[i "," j] \
+		      " ((" target_vars[i] " & MASK_" other_masks[i "," j] ") != 0)"
 	}
 }
 print ""