[compiler-rt] a19f0ee - Revert 1689ad27af5 "[builtins] Implement rounding mode support for i386/x86_64"

[Hans Wennborg via llvm-commits]

Author: Hans Wennborg
Date: 2019-11-19T09:37:31+01:00
New Revision: a19f0eec94e195cac676d0d473882b48f4fded90

URL: https://github.com/llvm/llvm-project/commit/a19f0eec94e195cac676d0d473882b48f4fded90
DIFF: https://github.com/llvm/llvm-project/commit/a19f0eec94e195cac676d0d473882b48f4fded90.diff

LOG: Revert 1689ad27af5 "[builtins] Implement rounding mode support for i386/x86_64"

It broke the build with MSVC:

fp_mode.c(20): error C2065: '__asm__': undeclared identifier

> Differential Revision: https://reviews.llvm.org/D69870

Added: 
    

Modified: 
    compiler-rt/lib/builtins/CMakeLists.txt
    compiler-rt/test/builtins/Unit/addtf3_test.c
    compiler-rt/test/builtins/Unit/subtf3_test.c

Removed: 
    compiler-rt/lib/builtins/i386/fp_mode.c


################################################################################
diff  --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index 207980c8e0a4..1d3d65a9940a 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -239,7 +239,6 @@ set(x86_ARCH_SOURCES
   floatuntixf.c
   mulxc3.c
   powixf2.c
-  i386/fp_mode.c
 )
 
 if (NOT MSVC)

diff  --git a/compiler-rt/lib/builtins/i386/fp_mode.c b/compiler-rt/lib/builtins/i386/fp_mode.c
deleted file mode 100644
index 62ab771222c0..000000000000
--- a/compiler-rt/lib/builtins/i386/fp_mode.c
+++ /dev/null
@@ -1,39 +0,0 @@
-//===----- lib/i386/fp_mode.c - Floaing-point mode utilities -----*- C -*-====//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../fp_mode.h"
-
-#define X87_TONEAREST  0x0000
-#define X87_DOWNWARD   0x0400
-#define X87_UPWARD     0x0800
-#define X87_TOWARDZERO 0x0c00
-#define X87_RMODE_MASK (X87_TONEAREST | X87_UPWARD | X87_DOWNWARD | X87_TOWARDZERO)
-
-FE_ROUND_MODE __fe_getround() {
-  // Assume that the rounding mode state for the fpu agrees with the SSE unit.
-  unsigned short cw;
-  __asm__ __volatile__ ("fnstcw %0" : "=m" (cw));
-
-  switch (cw & X87_RMODE_MASK) {
-    case X87_TONEAREST:
-      return FE_TONEAREST;
-    case X87_DOWNWARD:
-      return FE_DOWNWARD;
-    case X87_UPWARD:
-      return FE_UPWARD;
-    case X87_TOWARDZERO:
-      return FE_TOWARDZERO;
-  }
-  return FE_TONEAREST;
-}
-
-int __fe_raise_inexact() {
-  float f = 1.0f, g = 3.0f;
-  __asm__ __volatile__ ("fdivs %1" : "+t" (f) : "m" (g));
-  return 0;
-}

diff  --git a/compiler-rt/test/builtins/Unit/addtf3_test.c b/compiler-rt/test/builtins/Unit/addtf3_test.c
index dcd4efe9c901..7ca0355e42ad 100644
--- a/compiler-rt/test/builtins/Unit/addtf3_test.c
+++ b/compiler-rt/test/builtins/Unit/addtf3_test.c
@@ -76,8 +76,7 @@ int main()
                      UINT64_C(0x61e58dd6c51eb77c)))
         return 1;
 
-#if (defined(__arm__) || defined(__aarch64__)) && defined(__ARM_FP) || \
-    defined(i386) || defined(__x86_64__)
+#if (defined(__arm__) || defined(__aarch64__)) && defined(__ARM_FP)
     // Rounding mode tests on supported architectures
     const long double m = 1234.0L, n = 0.01L;
 

diff  --git a/compiler-rt/test/builtins/Unit/subtf3_test.c b/compiler-rt/test/builtins/Unit/subtf3_test.c
index 265ab642ecf0..b95f2ef996d6 100644
--- a/compiler-rt/test/builtins/Unit/subtf3_test.c
+++ b/compiler-rt/test/builtins/Unit/subtf3_test.c
@@ -69,8 +69,7 @@ int main()
                      UINT64_C(0xa44a7bca780a166c)))
         return 1;
 
-#if (defined(__arm__) || defined(__aarch64__)) && defined(__ARM_FP) || \
-    defined(i386) || defined(__x86_64__)
+#if (defined(__arm__) || defined(__aarch64__)) && defined(__ARM_FP)
     // Rounding mode tests on supported architectures
     const long double m = 1234.02L, n = 0.01L;