From: Andrew Senkevich <andrew.senkevich@intel.com>
Date: Thu, 30 Jul 2015 15:00:24 +0000 (+0300)
Subject: Prevent runtime fail of SSE vector math tests on non SSE4.1 machine.
X-Git-Tag: glibc-2.22~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e8ea51cc8e800a81375d5f99f9a42c6be142a8;p=thirdparty%2Fglibc.git

Prevent runtime fail of SSE vector math tests on non SSE4.1 machine.

    [BZ #18740]
    * sysdeps/x86_64/fpu/Makefile (double-vlen2-arch-ext-cflags,
    float-vlen4-arch-ext-cflags): Removed.
    * math/Makefile (CFLAGS-test-double-vlen2-wrappers.c,
    CFLAGS-test-float-vlen4-wrappers.c): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 2295f823735..8a424d0a5c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-30  Andrew Senkevich  <andrew.senkevich@intel.com>
+
+	[BZ #18740]
+	* sysdeps/x86_64/fpu/Makefile (double-vlen2-arch-ext-cflags,
+	float-vlen4-arch-ext-cflags): Removed.
+	* math/Makefile (CFLAGS-test-double-vlen2-wrappers.c,
+	CFLAGS-test-float-vlen4-wrappers.c): Likewise.
+
 2015-07-30  Mike Frysinger  <vapier@gentoo.org>
 
 	[BZ #14113]
diff --git a/math/Makefile b/math/Makefile
index 2c78dd0bb9c..6388baec89a 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -151,7 +151,6 @@ libm-test-vec-cflags = $(libm-test-fast-math-cflags) -fno-inline \
 		       -ffloat-store -D_OPENMP=201307 -Wno-unknown-pragmas
 
 CFLAGS-test-double-vlen2.c = $(libm-test-vec-cflags)
-CFLAGS-test-double-vlen2-wrappers.c = $(double-vlen2-arch-ext-cflags)
 
 CFLAGS-test-double-vlen4.c = $(libm-test-vec-cflags)
 CFLAGS-test-double-vlen4-wrappers.c = $(double-vlen4-arch-ext-cflags)
@@ -160,7 +159,6 @@ CFLAGS-test-double-vlen8.c = $(libm-test-vec-cflags)
 CFLAGS-test-double-vlen8-wrappers.c = $(double-vlen8-arch-ext-cflags)
 
 CFLAGS-test-float-vlen4.c = $(libm-test-vec-cflags)
-CFLAGS-test-float-vlen4-wrappers.c = $(float-vlen4-arch-ext-cflags)
 
 CFLAGS-test-float-vlen8.c = $(libm-test-vec-cflags)
 CFLAGS-test-float-vlen8-wrappers.c = $(float-vlen8-arch-ext-cflags)
diff --git a/sysdeps/x86_64/fpu/Makefile b/sysdeps/x86_64/fpu/Makefile
index e270b8af55d..1ebe5118bf3 100644
--- a/sysdeps/x86_64/fpu/Makefile
+++ b/sysdeps/x86_64/fpu/Makefile
@@ -33,12 +33,10 @@ ifeq (yes,$(config-cflags-avx512))
 libmvec-tests += double-vlen8 float-vlen16
 endif
 
-double-vlen2-arch-ext-cflags = -msse4
 double-vlen4-arch-ext-cflags = -mavx
 double-vlen4-arch-ext2-cflags = -mavx2
 double-vlen8-arch-ext-cflags = -mavx512f
 
-float-vlen4-arch-ext-cflags = -msse4
 float-vlen8-arch-ext-cflags = -mavx
 float-vlen8-arch-ext2-cflags = -mavx2
 float-vlen16-arch-ext-cflags = -mavx512f