From: Carlos O'Donell Date: Sat, 3 May 2014 04:25:21 +0000 (-0400) Subject: Fix -Wundef warning for FEATURE_INDEX_1. X-Git-Tag: glibc-2.20~554 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f1df5cf9d8d30c0747532301dca3cf9c99fbc8e;p=thirdparty%2Fglibc.git 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 b66031d5142..49c15b24524 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-02 Carlos O'Donell + + * 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 * 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 813b6de3bee..e4d265da59a 100644 --- 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 @@ -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