<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On Jun 23, 2011, at 10:19 AM, Rafael Espindola wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Author: rafael<br>Date: Thu Jun 23 09:19:39 2011<br>New Revision: 133718<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=133718&view=rev">http://llvm.org/viewvc/llvm-project?rev=133718&view=rev</a><br>Log:<br>Revert "revert 133714"<br><br>This reverts commit e8e00f5efb4a22238f2407bf813de4606f30c5aa.<br><br>The cmake build on OS X is still broken.<br></div></blockquote><div><br></div><div>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.</div><br><blockquote type="cite"><div><br>Removed:<br> llvm/trunk/lib/Analysis/FEnv.h<br>Modified:<br> llvm/trunk/lib/Analysis/ConstantFolding.cpp<br><br>Modified: llvm/trunk/lib/Analysis/ConstantFolding.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ConstantFolding.cpp?rev=133718&r1=133717&r2=133718&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ConstantFolding.cpp?rev=133718&r1=133717&r2=133718&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Analysis/ConstantFolding.cpp (original)<br>+++ llvm/trunk/lib/Analysis/ConstantFolding.cpp Thu Jun 23 09:19:39 2011<br>@@ -31,10 +31,9 @@<br> #include "llvm/Support/ErrorHandling.h"<br> #include "llvm/Support/GetElementPtrTypeIterator.h"<br> #include "llvm/Support/MathExtras.h"<br>+#include "llvm/Support/FEnv.h"<br> #include <cerrno><br> #include <cmath><br>-<br>-#include "FEnv.h"<br> using namespace llvm;<br><br> //===----------------------------------------------------------------------===//<br><br>Removed: llvm/trunk/lib/Analysis/FEnv.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/FEnv.h?rev=133717&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/FEnv.h?rev=133717&view=auto</a><br>==============================================================================<br>--- llvm/trunk/lib/Analysis/FEnv.h (original)<br>+++ llvm/trunk/lib/Analysis/FEnv.h (removed)<br>@@ -1,56 +0,0 @@<br>-//===- FEnv.h - Host floating-point exceptions ------------------*- C++ -*-===//<br>-//<br>-// The LLVM Compiler Infrastructure<br>-//<br>-// This file is distributed under the University of Illinois Open Source<br>-// License. See LICENSE.TXT for details.<br>-//<br>-//===----------------------------------------------------------------------===//<br>-//<br>-// This file provides an operating system independent interface to<br>-// floating-point exception interfaces.<br>-//<br>-//===----------------------------------------------------------------------===//<br>-<br>-#ifndef LLVM_SYSTEM_FENV_H<br>-#define LLVM_SYSTEM_FENV_H<br>-<br>-#include "llvm/Config/config.h"<br>-#include <cerrno><br>-#ifdef HAVE_FENV_H<br>-#include <fenv.h><br>-#endif<br>-<br>-// FIXME: Clang's #include handling apparently doesn't work for libstdc++'s<br>-// fenv.h; see PR6907 for details.<br>-#if defined(__clang__) && defined(_GLIBCXX_FENV_H)<br>-#undef HAVE_FENV_H<br>-#endif<br>-<br>-namespace llvm {<br>-namespace sys {<br>-<br>-/// llvm_fenv_clearexcept - Clear the floating-point exception state.<br>-static inline void llvm_fenv_clearexcept() {<br>-#ifdef HAVE_FENV_H<br>- feclearexcept(FE_ALL_EXCEPT);<br>-#endif<br>- errno = 0;<br>-}<br>-<br>-/// llvm_fenv_testexcept - Test if a floating-point exception was raised.<br>-static inline bool llvm_fenv_testexcept() {<br>- int errno_val = errno;<br>- if (errno_val == ERANGE || errno_val == EDOM)<br>- return true;<br>-#ifdef HAVE_FENV_H<br>- if (fetestexcept(FE_ALL_EXCEPT & ~FE_INEXACT))<br>- return true;<br>-#endif<br>- return false;<br>-}<br>-<br>-} // End sys namespace<br>-} // End llvm namespace<br>-<br>-#endif<br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits<br></div></blockquote></div><br><div>
<span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: 'Lucida Grande'; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; ">Thanks,<br><br>Justin Holewinski</span>
</div>
<br></body></html>