4 files changed, 12 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a07daee1669..522f1ad965a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix port to 32-bit AIX with xlc (Bug#17598).
+        * alloc.c (gdb_make_enums_visible): Remove FLOAT_TO_STRING_BUFSIZE.
+        * conf_post.h (FLEXIBLE_ARRAY_MEMBER) [__IBMC__]: Don't define to empty.
+        * lisp.h (FLOAT_TO_STRING_BUFSIZE): Make it a macro, instead of an enum,
+        to work around a compiler bug in IBM xlc 12.1.
+
 2014-05-29  Eli Zaretskii  <eliz@gnu.org>
 
         * xterm.c (x_update_window_end): Don't invalidate the entire
diff --git a/src/alloc.c b/src/alloc.c
index ccb955a547b..12b3d4ba165 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7003,7 +7003,6 @@ union
   enum CHECK_LISP_OBJECT_TYPE CHECK_LISP_OBJECT_TYPE;
   enum DEFAULT_HASH_SIZE DEFAULT_HASH_SIZE;
   enum enum_USE_LSB_TAG enum_USE_LSB_TAG;
-  enum FLOAT_TO_STRING_BUFSIZE FLOAT_TO_STRING_BUFSIZE;
   enum Lisp_Bits Lisp_Bits;
   enum Lisp_Compiled Lisp_Compiled;
   enum maxargs maxargs;
diff --git a/src/conf_post.h b/src/conf_post.h
index 312f2389415..446c8275613 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -297,8 +297,9 @@ extern void _DebPrint (const char *fmt, ...);
 
 /* To use the struct hack with N elements, declare the struct like this:
      struct s { ...; t name[FLEXIBLE_ARRAY_MEMBER]; };
-   and allocate (offsetof (struct s, name) + N * sizeof (t)) bytes.  */
-#if 199901 <= __STDC_VERSION__
+   and allocate (offsetof (struct s, name) + N * sizeof (t)) bytes.
+   IBM xlc 12.1 claims to do C99 but mishandles flexible array members.  */
+#if 199901 <= __STDC_VERSION__ && !defined __IBMC__
 # define FLEXIBLE_ARRAY_MEMBER
 #elif __GNUC__ && !defined __STRICT_ANSI__
 # define FLEXIBLE_ARRAY_MEMBER 0
diff --git a/src/lisp.h b/src/lisp.h
index af54887a51a..a92d7694a3b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3815,7 +3815,7 @@ extern void print_error_message (Lisp_Object, Lisp_Object, const char *,
                                  Lisp_Object);
 extern Lisp_Object internal_with_output_to_temp_buffer
         (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
-enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
+#define FLOAT_TO_STRING_BUFSIZE 350
 extern int float_to_string (char *, double);
 extern void init_print_once (void);
 extern void syms_of_print (void);