Revert:
2017-02-16 Zack Weinberg <zackw@panix.com>
* sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
Don't include init-arch.h.
* sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
Don't include init-arch.h.
+2017-02-17 Joseph Myers <joseph@codesourcery.com>
+
+ Revert:
+ 2017-02-16 Zack Weinberg <zackw@panix.com>
+
+ * sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
+ Don't include init-arch.h.
+ * sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
+ Don't include init-arch.h.
+
2017-02-17 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
[BZ #21171]
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <cpu-features.h>
-
#if defined REQUIRE_AVX
+# include <init-arch.h>
# define INIT_ARCH_EXT
+
# define CHECK_ARCH_EXT \
do \
{ \
while (0)
#elif defined REQUIRE_AVX2
+# include <init-arch.h>
# define INIT_ARCH_EXT
+
# define CHECK_ARCH_EXT \
do \
{ \
while (0)
#elif defined REQUIRE_AVX512F
+# include <init-arch.h>
# define INIT_ARCH_EXT
+
# define CHECK_ARCH_EXT \
do \
{ \
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <cpu-features.h>
+#include <init-arch.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>