diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/math-tests-arch.h | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/test-multiarch.c | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2f2a65b8bc..86deabff33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +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] 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> |