Fix -Wundef warning for FEATURE_INDEX_1.

Define FEATURE_INDEX_1 and FEATURE_INDEX_MAX as macros
for use by both assembly and C code. This fixes the
-Wundef error for cases where FEATURE_INDEX_1 was not
defined but used the correct value of 0 for an undefined
macro.

diff --git a/ChangeLog b/ChangeLog
index b66031d..49c15b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-02  Carlos O'Donell  <carlos@redhat.com>
+
+       * sysdeps/x86_64/multiarch/init-arch.h: Define FEATURE_INDEX_1 to 0,
+       and FEATURE_INDEX_MAX to 1.
+       [!__ASSEMBLER__]: Remove anonymous enum for FEATURE_INDEX_*.
+
 2014-05-01  Steve Ellcey  <sellcey@mips.com>
 
        * iconvdata/ansi_x3.110.c (ONE_DIRECTION): Define.

diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
index 813b6de..e4d265d 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.h
+++ b/sysdeps/x86_64/multiarch/init-arch.h
@@ -47,6 +47,12 @@
 #define bit_XMM_state  (1 << 1)
 #define bit_YMM_state  (2 << 1)
 
+/* The integer bit array index for the first set of internal feature bits.  */
+# define FEATURE_INDEX_1 0
+
+/* The current maximum size of the feature integer bit array.  */
+# define FEATURE_INDEX_MAX 1
+
 #ifdef __ASSEMBLER__
 
 # include <ifunc-defines.h>
@@ -82,13 +88,6 @@ enum
     COMMON_CPUID_INDEX_MAX
   };
 
-enum
-  {
-    FEATURE_INDEX_1 = 0,
-    /* Keep the following line at the end.  */
-    FEATURE_INDEX_MAX
-  };
-
 extern struct cpu_features
 {
   enum cpu_features_kind