[llvm-branch-commits] [llvm-branch] r214687 - Merging r213896:

[Bill Wendling]

Author: void
Date: Sun Aug  3 23:28:05 2014
New Revision: 214687

URL: http://llvm.org/viewvc/llvm-project?rev=214687&view=rev
Log:
Merging r213896:
------------------------------------------------------------------------
r213896 | compnerd | 2014-07-24 15:09:06 -0700 (Thu, 24 Jul 2014) | 6 lines

Target: invert condition for Windows

The Microsoft ABI and MSVCRT are considered the canonical C runtime and ABI.
The long double routines are not part of this environment.  However, cygwin and
MinGW both provide supplementary implementations.  Change the condition to
reflect this reality.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug  3 23:28:05 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213773,213793,213798,213815,213847,213880,213883-213884,213894-213895,213899,213915,214129,214180,214287,214331,214423,214429,214519
+/llvm/trunk:155241,213653,213749,213773,213793,213798,213815,213847,213880,213883-213884,213894-213896,213899,213915,214129,214180,214287,214331,214423,214429,214519

Modified: llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp?rev=214687&r1=214686&r2=214687&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp (original)
+++ llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp Sun Aug  3 23:28:05 2014
@@ -426,7 +426,7 @@ static void initialize(TargetLibraryInfo
     TLI.setUnavailable(LibFunc::fiprintf);
   }
 
-  if (T.isKnownWindowsMSVCEnvironment() || T.isWindowsItaniumEnvironment()) {
+  if (T.isOSWindows() && !T.isOSCygMing()) {
     // Win32 does not support long double
     TLI.setUnavailable(LibFunc::acosl);
     TLI.setUnavailable(LibFunc::asinl);