summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnton Korobeynikov <asl@math.spbu.ru>2008-03-22 21:18:22 +0000
committerAnton Korobeynikov <asl@math.spbu.ru>2008-03-22 21:18:22 +0000
commit2b4f7805851912d05b5bd5ef9b8a9afee1c60e39 (patch)
tree2f44250ac6f212d20da32bff92453c7e83c4069f /lib
parent508f0fdb534e23d453ecc4d4892d581bb9647c50 (diff)
downloadllvm-2b4f7805851912d05b5bd5ef9b8a9afee1c60e39.tar.gz
llvm-2b4f7805851912d05b5bd5ef9b8a9afee1c60e39.tar.bz2
llvm-2b4f7805851912d05b5bd5ef9b8a9afee1c60e39.tar.xz
Honour built-in defines on win64 targets for automatically subtarget recognize.
Force stack alignment to 16 bytes on win targets. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48695 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/X86/X86Subtarget.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index aff36a117a..483b8a4fd9 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -274,7 +274,7 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
} else if (TT.empty()) {
#if defined(__CYGWIN__)
TargetType = isCygwin;
-#elif defined(__MINGW32__)
+#elif defined(__MINGW32__) || defined(__MINGW64__)
TargetType = isMingw;
#elif defined(__APPLE__)
TargetType = isDarwin;
@@ -284,7 +284,7 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
DarwinVers = 8; // Minimum supported darwin is Tiger.
#endif
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(_WIN64)
TargetType = isWindows;
#endif
}
@@ -299,6 +299,7 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS, bool is64Bit)
if (TargetType == isDarwin ||
TargetType == isCygwin ||
TargetType == isMingw ||
+ TargetType == isWindows ||
(TargetType == isELF && Is64Bit))
stackAlignment = 16;
}