From 4929eb911bbbe3a39b68bdf0c7d58002e4d1c3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Thu, 21 Jul 2011 19:41:04 +0200
Subject: [PATCH] Issue #12372: POSIX semaphores are broken on AIX: don't use
 them.

---
 Misc/NEWS    | 2 ++
 configure    | 8 ++------
 configure.in | 7 ++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index b7d00f00b95..b4228aaa46d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #12372: POSIX semaphores are broken on AIX: don't use them.
+
 - Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2
   directory, so that "import DLFCN" and other similar imports work on
   Linux 3.0.
diff --git a/configure b/configure
index 4a60b10b2e1..dc20f6917b4 100755
--- a/configure
+++ b/configure
@@ -8987,7 +8987,7 @@ $as_echo "#define _POSIX_THREADS 1" >>confdefs.h
 
       # Bug 662787: Using semaphores causes unexplicable hangs on Solaris 8.
       case  $ac_sys_system/$ac_sys_release in
-  SunOS/5.6)
+      SunOS/5.6)
 $as_echo "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h
 
 		       ;;
@@ -8995,14 +8995,10 @@ $as_echo "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h
 $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 
 		       ;;
-      AIX/5)
+      AIX/*)
 $as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
 
 		       ;;
-      AIX/6)
-$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h
-
-                      ;;
       esac
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
diff --git a/configure.in b/configure.in
index 9749e790cc2..91a6c10e7fc 100644
--- a/configure.in
+++ b/configure.in
@@ -2359,18 +2359,15 @@ if test "$posix_threads" = "yes"; then
 
       # Bug 662787: Using semaphores causes unexplicable hangs on Solaris 8.
       case  $ac_sys_system/$ac_sys_release in
-  SunOS/5.6) AC_DEFINE(HAVE_PTHREAD_DESTRUCTOR, 1,
+      SunOS/5.6) AC_DEFINE(HAVE_PTHREAD_DESTRUCTOR, 1,
                        [Defined for Solaris 2.6 bug in pthread header.])
 		       ;;
       SunOS/5.8) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
 		       [Define if the Posix semaphores do not work on your system])
 		       ;;
-      AIX/5) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
+      AIX/*) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
 		       [Define if the Posix semaphores do not work on your system])
 		       ;;
-      AIX/6) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
-                      Define if the Posix semaphores do not work on your system)
-                      ;;
       esac
 
       AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported)