Revert:

        PR target/89397
        * config/i386/i386.c (ix86_option_override_internal): Set
        opts->x_ix86_fpmath to FPMATH_387 when SSE is disabled.

        gcc/testsuite/

        PR target/89397
        * gcc.target/i386/pr89397.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269040 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b544e089e57475f12ee63af4075b50a0f534b0c3..13580de7525afad7891545d4ad9fe0d1d8f652f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -16,12 +16,6 @@
 
        * config/gcn/gcn.c (print_operand): Fix typo.
 
-2019-02-19  H.J. Lu  <hongjiu.lu@intel.com>
-
-       PR target/89397
-       * config/i386/i386.c (ix86_option_override_internal): Set
-       opts->x_ix86_fpmath to FPMATH_387 when SSE is disabled.
-
 2019-02-19  Richard Biener  <rguenther@suse.de>
 
         PR middle-end/88074

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index bed17330fa82bb06dd76c11e6bae7e1ba0ba5ef2..591a7cdccdc7178758dbb1e6a79924eae2c3e1ef 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4310,9 +4310,10 @@ ix86_option_override_internal (bool main_args_p,
          if (!TARGET_SSE_P (opts->x_ix86_isa_flags))
            {
              if (TARGET_80387_P (opts->x_target_flags))
-               warning (0, "SSE instruction set disabled, using 387 arithmetics");
-             /* NB: 387 codegen is guarded by TARGET_80387.  */
-             opts->x_ix86_fpmath = FPMATH_387;
+               {
+                 warning (0, "SSE instruction set disabled, using 387 arithmetics");
+                 opts->x_ix86_fpmath = FPMATH_387;
+               }
            }
          else if ((opts->x_ix86_fpmath & FPMATH_387)
                   && !TARGET_80387_P (opts->x_target_flags))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3b415cd2564a8e691884b8e2a22553412b106689..d7240090c036bbb2dcf04260db2a2d5a9048b305 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -28,11 +28,6 @@
        * c-c++-common/goacc/asyncwait-5.c: Remove XFAILs.
        * gfortran.dg/goacc/asyncwait-5.f: Likewise.
 
-2019-02-19  H.J. Lu  <hongjiu.lu@intel.com>
-
-       PR target/89397
-       * gcc.target/i386/pr89397.c: New test.
-
 2019-02-19  Richard Biener  <rguenther@suse.de>
 
         PR middle-end/88074

diff --git a/gcc/testsuite/gcc.target/i386/pr89397.c b/gcc/testsuite/gcc.target/i386/pr89397.c
deleted file mode 100644 (file)
index 42afa6c..0000000
--- a/gcc/testsuite/gcc.target/i386/pr89397.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-mfpmath=sse,387 -msoft-float -mno-sse" } */
-
-_Atomic double a;
-int b;
-
-void
-foo (void)
-{
-  a += b; /* { dg-error "SSE register return with SSE disabled" "" { target { ! ia32 } } } */
-}