When disabling SSE, make sure -fpmath is not set to use SSE either

This fixes errors when we inject sse options through CFLAGS and now
that we have -Werror turned on by default this warning turns into an
error on x86:

$ gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -x c /dev/null -S -mno-sse -mno-mmx
/dev/null:1:0: warning: SSE instruction set disabled, using 387 arithmetics

Where as:

$ gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -x c /dev/null -S -mno-sse -mno-mmx -mfpmath=387

Generates no warnings.

diff --git a/ChangeLog b/ChangeLog
index e5f78c019d03d5ca67065e9ab45771066842fc8c..7c01a727c3e65f649fda335c22f0abea32b44d6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-09  Khem Raj  <raj.khem@gmail.com>
+
+       [BZ #17950]
+       * sysdeps/i386/Makefile [$(subdir) == elf] (CFLAGS-.os):
+       Add -mfpmath=387.
+
 2016-04-09  Mike Frysinger  <vapier@gentoo.org>
 
        * sysdeps/i386/configure.ac: Change == to = when calling test.

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 168512fc327e85b248fb037211e4617f3e0fd5a7..6c91842b0d4adf91d2878c73e1f53273611fba9d 100644 (file)
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -88,8 +88,9 @@ ifeq ($(subdir),elf)
 # Make sure no code in ld.so uses mm/xmm/ymm/zmm registers on i386 since
 # the first 3 mm/xmm/ymm/zmm registers are used to pass vector parameters
 # which must be preserved.
+# With SSE disabled, ensure -fpmath is not set to use sse either.
 CFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
-                  -mno-sse -mno-mmx)
+                  -mno-sse -mno-mmx -mfpmath=387)
 
 tests-special += $(objpfx)tst-ld-sse-use.out
 $(objpfx)tst-ld-sse-use.out: ../sysdeps/i386/tst-ld-sse-use.sh $(objpfx)ld.so