[llvm-branch-commits] [llvm-branch] r214686 - Merging r213883:

[Bill Wendling]

Author: void
Date: Sun Aug  3 23:27:37 2014
New Revision: 214686

URL: http://llvm.org/viewvc/llvm-project?rev=214686&view=rev
Log:
Merging r213883:
------------------------------------------------------------------------
r213883 | compnerd | 2014-07-24 10:46:36 -0700 (Thu, 24 Jul 2014) | 5 lines

X86: correct library call setup for Windows itanium

This target is identical to the Windows MSVC (and follows Microsoft ABI for C).
Correct the library call setup for this target.  The same set of library calls
are missing on this environment.
------------------------------------------------------------------------

Added:
    llvm/branches/release_35/test/MC/X86/x86-windows-itanium-libcalls.ll
      - copied unchanged from r213883, llvm/trunk/test/MC/X86/x86-windows-itanium-libcalls.ll
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:27:37 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,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-213895,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=214686&r1=214685&r2=214686&view=diff
==============================================================================
--- llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp (original)
+++ llvm/branches/release_35/lib/Target/TargetLibraryInfo.cpp Sun Aug  3 23:27:37 2014
@@ -426,7 +426,7 @@ static void initialize(TargetLibraryInfo
     TLI.setUnavailable(LibFunc::fiprintf);
   }
 
-  if (T.isKnownWindowsMSVCEnvironment()) {
+  if (T.isKnownWindowsMSVCEnvironment() || T.isWindowsItaniumEnvironment()) {
     // Win32 does not support long double
     TLI.setUnavailable(LibFunc::acosl);
     TLI.setUnavailable(LibFunc::asinl);