diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2008-03-22 20:57:27 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2008-03-22 20:57:27 +0000 |
| commit | 1a979d9eab68b353208cdff87b09ff703d5bf15d (patch) | |
| tree | 885634490f5bd5201032256ce5590d9b22f5dde9 /lib/Target | |
| parent | 8f88cb08999187b143c6772216dd2ef18d9b7824 (diff) | |
Add convenient helper for win64 check. Simplify things slightly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48691 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/X86/X86CallingConv.td | 3 | ||||
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86Subtarget.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/Target/X86/X86CallingConv.td b/lib/Target/X86/X86CallingConv.td index 3206e183eb..d4f4e265c2 100644 --- a/lib/Target/X86/X86CallingConv.td +++ b/lib/Target/X86/X86CallingConv.td @@ -101,8 +101,7 @@ def RetCC_X86_32 : CallingConv<[ // This is the root return-value convention for the X86-64 backend. def RetCC_X86_64 : CallingConv<[ // Mingw64 and native Win64 use Win64 CC - CCIfSubtarget<"isTargetMingw()", CCDelegateTo<RetCC_X86_Win64_C>>, - CCIfSubtarget<"isTargetWindows()", CCDelegateTo<RetCC_X86_Win64_C>>, + CCIfSubtarget<"isTargetWin64()", CCDelegateTo<RetCC_X86_Win64_C>>, // Otherwise, drop to normal X86-64 CC CCDelegateTo<RetCC_X86_64_C> diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 933c33e3d4..dd2d7849d7 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -1009,7 +1009,7 @@ CCAssignFn *X86TargetLowering::CCAssignFnForNode(SDOperand Op) const { unsigned CC = cast<ConstantSDNode>(Op.getOperand(1))->getValue(); if (Subtarget->is64Bit()) { - if (Subtarget->isTargetWindows() || Subtarget->isTargetMingw()) + if (Subtarget->isTargetWin64()) return CC_X86_Win64_C; else { if (CC == CallingConv::Fast && PerformTailCallOpt) diff --git a/lib/Target/X86/X86Subtarget.h b/lib/Target/X86/X86Subtarget.h index e34d1f1aee..6488d474d1 100644 --- a/lib/Target/X86/X86Subtarget.h +++ b/lib/Target/X86/X86Subtarget.h @@ -138,6 +138,9 @@ public: bool isTargetCygMing() const { return (TargetType == isMingw || TargetType == isCygwin); } bool isTargetCygwin() const { return TargetType == isCygwin; } + bool isTargetWin64() const { + return (Is64Bit && (TargetType == isMingw || TargetType == isWindows)); + } std::string getDataLayout() const { const char *p; |