From 195f3afcbed4986beaecd5c28fdbe27ee0a402e0 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed, 31 Dec 2014 13:22:58 +0530
Subject: [PATCH] Use one-dimension arrays in gen-posix-conf-vars.awk

True multi-dimensional arrays were introduced in awk 4.0 and we
support awk versions as early as 3.12.  Use a single subscript of the
form prefix_conf instead of two dimensions to work around this
limitation.  We also need one additional array of just the conf names
subscripted by the prefix_conf to print the names for the
specifications.

	* scripts/gen-posix-conf-vars.awk: Don't use multi-dimensional
	arrays.
---
 ChangeLog                       |  5 +++++
 scripts/gen-posix-conf-vars.awk | 46 ++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70f8675ad2..4597880d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-31  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* scripts/gen-posix-conf-vars.awk: Don't use multi-dimensional
+	arrays.
+
 2014-12-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #17775]
diff --git a/scripts/gen-posix-conf-vars.awk b/scripts/gen-posix-conf-vars.awk
index 007cd744de..220d0e89b9 100644
--- a/scripts/gen-posix-conf-vars.awk
+++ b/scripts/gen-posix-conf-vars.awk
@@ -42,36 +42,36 @@ $1 == "}" {
   # CONFSTR: A configuration string
   # SYSCONF: A numeric value
   # SPEC: A specification
-  sc_prefixes[prefix][$1] = sc_prefix
-  conf[prefix][$1] = type
+  c = prefix "_" $1
+  sc_prefixes[c] = sc_prefix
+  prefix_conf[c] = type
+  conf[c] = $1
 }
 
 END {
   print "/* AUTOGENERATED by gen-posix-conf-vars.awk.  DO NOT EDIT.  */\n"
 
   # Generate macros that specify if a sysconf macro is defined and/or set.
-  for (p in conf) {
-    for (c in conf[p]) {
-      printf "#ifndef _%s_%s\n", p, c
-      printf "# define CONF_DEF_%s_%s CONF_DEF_UNDEFINED\n", p, c
-      # CONFSTR have string values and they are not set or unset.
-      if (conf[p][c] != "CONFSTR") {
-	printf "#else\n"
-	printf "# if _%s_%s > 0\n", p, c
-	printf "#  define CONF_DEF_%s_%s CONF_DEF_DEFINED_SET\n", p, c
-	printf "# else\n"
-	printf "#  define CONF_DEF_%s_%s CONF_DEF_DEFINED_UNSET\n", p, c
-	printf "# endif\n"
-      }
-      printf "#endif\n\n"
+  for (c in prefix_conf) {
+    printf "#ifndef _%s\n", c
+    printf "# define CONF_DEF_%s CONF_DEF_UNDEFINED\n", c
+    # CONFSTR have string values and they are not set or unset.
+    if (prefix_conf[c] != "CONFSTR") {
+      printf "#else\n"
+      printf "# if _%s > 0\n", c
+      printf "#  define CONF_DEF_%s CONF_DEF_DEFINED_SET\n", c
+      printf "# else\n"
+      printf "#  define CONF_DEF_%s CONF_DEF_DEFINED_UNSET\n", c
+      printf "# endif\n"
+    }
+    printf "#endif\n\n"
 
-      # Build a name -> sysconf number associative array to print a C array at
-      # the end.
-      if (conf[p][c] == "SPEC") {
-	name = sprintf ("%s_%s", p, c)
-	num = sprintf ("%s_%s", sc_prefixes[p][c], c)
-	spec[name] = num
-      }
+    # Build a name -> sysconf number associative array to print a C array at
+    # the end.
+    if (prefix_conf[c] == "SPEC") {
+      name = sprintf ("%s", c)
+      num = sprintf ("%s_%s", sc_prefixes[c], conf[c])
+      spec[name] = num
     }
   }
 
-- 
2.11.4.GIT