summary refs log tree commit diff
path: root/sysdeps/x86_64
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-02-17 17:08:17 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-02-17 17:08:17 +0000
commitf7a51347a4e369fcc51e867ef03826e99acc4fdc (patch)
tree2843ee9095190da8b1f626145bf5f23c5a3a9795 /sysdeps/x86_64
parent51b34a9c47e4228873788ad66699c328e27a3295 (diff)
downloadglibc-f7a51347a4e369fcc51e867ef03826e99acc4fdc.tar.gz
glibc-f7a51347a4e369fcc51e867ef03826e99acc4fdc.tar.xz
glibc-f7a51347a4e369fcc51e867ef03826e99acc4fdc.zip
Revert header inclusion changes that break math/ testing on x86_64.
	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.
Diffstat (limited to 'sysdeps/x86_64')
-rw-r--r--sysdeps/x86_64/fpu/math-tests-arch.h8
-rw-r--r--sysdeps/x86_64/multiarch/test-multiarch.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/x86_64/fpu/math-tests-arch.h b/sysdeps/x86_64/fpu/math-tests-arch.h
index 9278e3440b..98f7cf6548 100644
--- a/sysdeps/x86_64/fpu/math-tests-arch.h
+++ b/sysdeps/x86_64/fpu/math-tests-arch.h
@@ -16,11 +16,11 @@
    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                                                           \
     {                                                          \
@@ -29,8 +29,10 @@
   while (0)
 
 #elif defined REQUIRE_AVX2
+# include <init-arch.h>
 
 # define INIT_ARCH_EXT
+
 # define CHECK_ARCH_EXT                                        \
   do                                                           \
     {                                                          \
@@ -39,8 +41,10 @@
   while (0)
 
 #elif defined REQUIRE_AVX512F
+# include <init-arch.h>
 
 # define INIT_ARCH_EXT
+
 # define CHECK_ARCH_EXT                                        \
   do                                                           \
     {                                                          \
diff --git a/sysdeps/x86_64/multiarch/test-multiarch.c b/sysdeps/x86_64/multiarch/test-multiarch.c
index 597d64e1e8..3974842c19 100644
--- a/sysdeps/x86_64/multiarch/test-multiarch.c
+++ b/sysdeps/x86_64/multiarch/test-multiarch.c
@@ -16,7 +16,7 @@
    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>