From: Chris Demetriou <cgd@google.com>
Date: Fri, 2 Mar 2012 08:32:45 +0000 (+0100)
Subject: 2012-03-01  Chris Demetriou  <cgd@google.com>
X-Git-Tag: glibc-2.16-tps~899
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1eeb65d491c0fec94b29cfbbd2e384c9f3765cc;p=thirdparty%2Fglibc.git

2012-03-01  Chris Demetriou  <cgd@google.com>

	* sysdeps/gnu/errlist-compat.awk: Don't depend on AWK internals
	* to
	have predictable order.
---

diff --git a/ChangeLog b/ChangeLog
index 9f81c1a2474..29c5dc28f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Chris Demetriou  <cgd@google.com>
+
+	* sysdeps/gnu/errlist-compat.awk: Don't depend on AWK internals to
+	have predictable order.
+
 2012-03-01  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: Delete.
diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk
index 0e97d05d665..4f70e927c52 100644
--- a/sysdeps/gnu/errlist-compat.awk
+++ b/sysdeps/gnu/errlist-compat.awk
@@ -84,7 +84,10 @@ END {
     printf "#define ERR_MAX %d\n\n", highest;
   }
 
-  for (old in compat) {
+  # same regardless of awk's ordering of the associative array.
+  num_compat_elems = asorti(compat, compat_indices)
+  for (i = 1; i <= num_compat_elems; i++) {
+    old = compat_indices[i]
     new = compat[old];
     n = vcount[old];
     printf "#if SHLIB_COMPAT (libc, %s, %s)\n", old, new;