[llvm] r210485 - Remove old fenv.h workaround for a historic clang driver bug

Alp Toker alp at nuanti.com
Mon Jun 9 12:00:52 PDT 2014


Author: alp
Date: Mon Jun  9 14:00:52 2014
New Revision: 210485

URL: http://llvm.org/viewvc/llvm-project?rev=210485&view=rev
Log:
Remove old fenv.h workaround for a historic clang driver bug

Tested and works fine with clang using libstdc++.

All indications are that this was fixed some time ago and isn't a problem with
any clang version we support.

I've added a note in PR6907 which is still open for some reason.

Modified:
    llvm/trunk/lib/Analysis/ConstantFolding.cpp

Modified: llvm/trunk/lib/Analysis/ConstantFolding.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ConstantFolding.cpp?rev=210485&r1=210484&r2=210485&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ConstantFolding.cpp (original)
+++ llvm/trunk/lib/Analysis/ConstantFolding.cpp Mon Jun  9 14:00:52 2014
@@ -39,13 +39,6 @@
 
 #ifdef HAVE_FENV_H
 #include <fenv.h>
-#define USE_FENV
-#endif
-
-// FIXME: Clang's #include handling apparently doesn't work for libstdc++'s
-// fenv.h; see PR6907 for details.
-#if defined(__clang__) && defined(_GLIBCXX_FENV_H)
-#undef USE_FENV
 #endif
 
 using namespace llvm;
@@ -1329,7 +1322,7 @@ static Constant *GetConstantFoldFPValue(
 namespace {
 /// llvm_fenv_clearexcept - Clear the floating-point exception state.
 static inline void llvm_fenv_clearexcept() {
-#if defined(USE_FENV) && HAVE_DECL_FE_ALL_EXCEPT
+#if defined(HAVE_FENV_H) && HAVE_DECL_FE_ALL_EXCEPT
   feclearexcept(FE_ALL_EXCEPT);
 #endif
   errno = 0;
@@ -1340,7 +1333,7 @@ static inline bool llvm_fenv_testexcept(
   int errno_val = errno;
   if (errno_val == ERANGE || errno_val == EDOM)
     return true;
-#if defined(USE_FENV) && HAVE_DECL_FE_ALL_EXCEPT && HAVE_DECL_FE_INEXACT
+#if defined(HAVE_FENV_H) && HAVE_DECL_FE_ALL_EXCEPT && HAVE_DECL_FE_INEXACT
   if (fetestexcept(FE_ALL_EXCEPT & ~FE_INEXACT))
     return true;
 #endif





More information about the llvm-commits mailing list