4 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c05a9c6..ac8fe51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #15997]
+	* sysdeps/unix/sysv/linux/configure.ac (arch_minimum_kernel): Set
+	to 3.4.0 for x32.
+	* sysdeps/unix/sysv/linux/configure: Regenerated.
+
 2013-11-13  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #16151]
diff --git a/NEWS b/NEWS
index c6ec272..c338d39 100644
--- a/NEWS
+++ b/NEWS
@@ -16,9 +16,9 @@ Version 2.19
   15735, 15736, 15748, 15749, 15754, 15760, 15763, 15764, 15797, 15799,
   15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886,
   15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15917, 15919,
-  15921, 15923, 15939, 15948, 15963, 15966, 15985, 15988, 16032, 16034,
-  16036, 16037, 16041, 16071, 16072, 16074, 16078, 16112, 16150, 16151,
-  16153.
+  15921, 15923, 15939, 15948, 15963, 15966, 15985, 15988, 15997, 16032,
+  16034, 16036, 16037, 16041, 16071, 16072, 16074, 16078, 16112, 16150,
+  16151, 16153.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 84dfbb8..643da86 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -187,6 +187,9 @@ case "$machine" in
     libc_cv_gcc_unwind_find_fde=yes
     arch_minimum_kernel=2.6.16
     ;;
+  x86_64/x32)
+    arch_minimum_kernel=3.4.0
+    ;;
   powerpc/powerpc32*)
     libc_cv_gcc_unwind_find_fde=yes
     arch_minimum_kernel=2.6.16
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 5e5902d..1be921f 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -43,6 +43,9 @@ case "$machine" in
     libc_cv_gcc_unwind_find_fde=yes
     arch_minimum_kernel=2.6.16
     ;;
+  x86_64/x32)
+    arch_minimum_kernel=3.4.0
+    ;;
   powerpc/powerpc32*)
     libc_cv_gcc_unwind_find_fde=yes
     arch_minimum_kernel=2.6.16