From c38ebd78a80ddfad8fb2df8a5666f4bc765dec7b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Wed, 15 Mar 2017 21:44:13 +0100
Subject: [PATCH] stdalign: Make it work with HP-UX cc.

* lib/stdalign.in.h (_Alignas): Don't define for HP-UX cc.
* m4/stdalign.m4 (gl_STDALIGN_H): No need to enable the extra test
for HP-UX cc.
---
 ChangeLog         | 7 +++++++
 lib/stdalign.in.h | 2 +-
 m4/stdalign.m4    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34606a582b..7087aaf5f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-17  Bruno Haible  <bruno@clisp.org>
+
+	stdalign: Make it work with HP-UX cc.
+	* lib/stdalign.in.h (_Alignas): Don't define for HP-UX cc.
+	* m4/stdalign.m4 (gl_STDALIGN_H): No need to enable the extra test
+	for HP-UX cc.
+
 2017-03-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	flexmember: try to detect HP-UX 11.31 cc bug
diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h
index c2b791ea69..f6f419000c 100644
--- a/lib/stdalign.in.h
+++ b/lib/stdalign.in.h
@@ -103,7 +103,7 @@
 # elif ((defined __APPLE__ && defined __MACH__                  \
          ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__)                 \
          : __GNUC__)                                            \
-        || 061200 <= __HP_cc || 061200 <= __HP_aCC                \
+        || 061200 <= __HP_aCC                                   \
         || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)
 #  define _Alignas(a) __attribute__ ((__aligned__ (a)))
 # elif 1300 <= _MSC_VER
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4
index 3a1265824e..5c15ef01c0 100644
--- a/m4/stdalign.m4
+++ b/m4/stdalign.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_STDALIGN_H],
                  || (defined __APPLE__ && defined __MACH__ \
                      ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
                      : __GNUC__) \
-                 || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \
+                 || __HP_aCC || __IBMC__ || __IBMCPP__ \
                  || __ICC || 0x5110 <= __SUNPRO_C \
                  || 1300 <= _MSC_VER)
               struct alignas_test { char c; char alignas (8) alignas_8; };
-- 
2.39.5