[llvm-commits] [llvm] r133718 - in /llvm/trunk/lib/Analysis: ConstantFolding.cpp FEnv.h

[Justin Holewinski]

On Jun 23, 2011, at 10:19 AM, Rafael Espindola wrote:

> Author: rafael
> Date: Thu Jun 23 09:19:39 2011
> New Revision: 133718
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=133718&view=rev
> Log:
> Revert "revert 133714"
> 
> This reverts commit e8e00f5efb4a22238f2407bf813de4606f30c5aa.
> 
> The cmake build on OS X is still broken.

What's wrong with the CMake build?  This commit fixes the build for me with 10.7 + Xcode 4.2 + CMake 2.8.4.  I build LLVM and Clang together.

> 
> Removed:
>    llvm/trunk/lib/Analysis/FEnv.h
> 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=133718&r1=133717&r2=133718&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Analysis/ConstantFolding.cpp (original)
> +++ llvm/trunk/lib/Analysis/ConstantFolding.cpp Thu Jun 23 09:19:39 2011
> @@ -31,10 +31,9 @@
> #include "llvm/Support/ErrorHandling.h"
> #include "llvm/Support/GetElementPtrTypeIterator.h"
> #include "llvm/Support/MathExtras.h"
> +#include "llvm/Support/FEnv.h"
> #include <cerrno>
> #include <cmath>
> -
> -#include "FEnv.h"
> using namespace llvm;
> 
> //===----------------------------------------------------------------------===//
> 
> Removed: llvm/trunk/lib/Analysis/FEnv.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/FEnv.h?rev=133717&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Analysis/FEnv.h (original)
> +++ llvm/trunk/lib/Analysis/FEnv.h (removed)
> @@ -1,56 +0,0 @@
> -//===- FEnv.h - Host floating-point exceptions ------------------*- C++ -*-===//
> -//
> -//                     The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file provides an operating system independent interface to
> -// floating-point exception interfaces.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef LLVM_SYSTEM_FENV_H
> -#define LLVM_SYSTEM_FENV_H
> -
> -#include "llvm/Config/config.h"
> -#include <cerrno>
> -#ifdef HAVE_FENV_H
> -#include <fenv.h>
> -#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 HAVE_FENV_H
> -#endif
> -
> -namespace llvm {
> -namespace sys {
> -
> -/// llvm_fenv_clearexcept - Clear the floating-point exception state.
> -static inline void llvm_fenv_clearexcept() {
> -#ifdef HAVE_FENV_H
> -  feclearexcept(FE_ALL_EXCEPT);
> -#endif
> -  errno = 0;
> -}
> -
> -/// llvm_fenv_testexcept - Test if a floating-point exception was raised.
> -static inline bool llvm_fenv_testexcept() {
> -  int errno_val = errno;
> -  if (errno_val == ERANGE || errno_val == EDOM)
> -    return true;
> -#ifdef HAVE_FENV_H
> -  if (fetestexcept(FE_ALL_EXCEPT & ~FE_INEXACT))
> -    return true;
> -#endif
> -  return false;
> -}
> -
> -} // End sys namespace
> -} // End llvm namespace
> -
> -#endif
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Thanks,

Justin Holewinski

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20110623/b1b48f59/attachment.html>