Triple::MinGW64 is deprecated and removed. We can use Triple::MinGW32 generally.

No one uses *-mingw64. mingw-w64 is represented as {i686|x86_64}-w64-mingw32. In llvm side, i686 and x64 can be treated as similar way.

llvm-svn: 125747
This commit is contained in:
NAKAMURA Takumi 2011-02-17 12:24:17 +00:00
parent 0544fe7287
commit 4c14a5cc2c
9 changed files with 5 additions and 15 deletions

View File

@ -84,8 +84,7 @@ public:
FreeBSD, FreeBSD,
Linux, Linux,
Lv2, // PS3 Lv2, // PS3
MinGW32, MinGW32, // i*86-pc-mingw32, *-w64-mingw32
MinGW64,
NetBSD, NetBSD,
OpenBSD, OpenBSD,
Psp, Psp,

View File

@ -101,7 +101,6 @@ const char *Triple::getOSTypeName(OSType Kind) {
case Linux: return "linux"; case Linux: return "linux";
case Lv2: return "lv2"; case Lv2: return "lv2";
case MinGW32: return "mingw32"; case MinGW32: return "mingw32";
case MinGW64: return "mingw64";
case NetBSD: return "netbsd"; case NetBSD: return "netbsd";
case OpenBSD: return "openbsd"; case OpenBSD: return "openbsd";
case Psp: return "psp"; case Psp: return "psp";
@ -318,8 +317,6 @@ Triple::OSType Triple::ParseOS(StringRef OSName) {
return Lv2; return Lv2;
else if (OSName.startswith("mingw32")) else if (OSName.startswith("mingw32"))
return MinGW32; return MinGW32;
else if (OSName.startswith("mingw64"))
return MinGW64;
else if (OSName.startswith("netbsd")) else if (OSName.startswith("netbsd"))
return NetBSD; return NetBSD;
else if (OSName.startswith("openbsd")) else if (OSName.startswith("openbsd"))

View File

@ -45,7 +45,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT,
case Triple::Darwin: case Triple::Darwin:
return createMachOStreamer(Ctx, TAB, OS, Emitter, RelaxAll); return createMachOStreamer(Ctx, TAB, OS, Emitter, RelaxAll);
case Triple::MinGW32: case Triple::MinGW32:
case Triple::MinGW64:
case Triple::Cygwin: case Triple::Cygwin:
case Triple::Win32: case Triple::Win32:
llvm_unreachable("ARM does not support Windows COFF format"); llvm_unreachable("ARM does not support Windows COFF format");

View File

@ -41,7 +41,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT,
llvm_unreachable("MBlaze does not support Darwin MACH-O format"); llvm_unreachable("MBlaze does not support Darwin MACH-O format");
return NULL; return NULL;
case Triple::MinGW32: case Triple::MinGW32:
case Triple::MinGW64:
case Triple::Cygwin: case Triple::Cygwin:
case Triple::Win32: case Triple::Win32:
llvm_unreachable("MBlaze does not support Windows COFF format"); llvm_unreachable("MBlaze does not support Windows COFF format");

View File

@ -428,7 +428,7 @@ TargetAsmBackend *llvm::createX86_64AsmBackend(const Target &T,
switch (Triple(TT).getOS()) { switch (Triple(TT).getOS()) {
case Triple::Darwin: case Triple::Darwin:
return new DarwinX86_64AsmBackend(T); return new DarwinX86_64AsmBackend(T);
case Triple::MinGW64: case Triple::MinGW32:
case Triple::Cygwin: case Triple::Cygwin:
case Triple::Win32: case Triple::Win32:
if (Triple(TT).getEnvironment() == Triple::MachO) if (Triple(TT).getEnvironment() == Triple::MachO)

View File

@ -175,9 +175,7 @@ public:
bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; } bool isTargetLinux() const { return TargetTriple.getOS() == Triple::Linux; }
bool isTargetWindows() const { return TargetTriple.getOS() == Triple::Win32; } bool isTargetWindows() const { return TargetTriple.getOS() == Triple::Win32; }
bool isTargetMingw() const { bool isTargetMingw() const { return TargetTriple.getOS() == Triple::MinGW32; }
return TargetTriple.getOS() == Triple::MinGW32 ||
TargetTriple.getOS() == Triple::MinGW64; }
bool isTargetCygwin() const { return TargetTriple.getOS() == Triple::Cygwin; } bool isTargetCygwin() const { return TargetTriple.getOS() == Triple::Cygwin; }
bool isTargetCygMing() const { bool isTargetCygMing() const {
return isTargetMingw() || isTargetCygwin(); return isTargetMingw() || isTargetCygwin();

View File

@ -30,7 +30,6 @@ static MCAsmInfo *createMCAsmInfo(const Target &T, StringRef TT) {
case Triple::Darwin: case Triple::Darwin:
return new X86MCAsmInfoDarwin(TheTriple); return new X86MCAsmInfoDarwin(TheTriple);
case Triple::MinGW32: case Triple::MinGW32:
case Triple::MinGW64:
case Triple::Cygwin: case Triple::Cygwin:
case Triple::Win32: case Triple::Win32:
if (TheTriple.getEnvironment() == Triple::MachO) if (TheTriple.getEnvironment() == Triple::MachO)
@ -53,7 +52,6 @@ static MCStreamer *createMCStreamer(const Target &T, const std::string &TT,
case Triple::Darwin: case Triple::Darwin:
return createMachOStreamer(Ctx, TAB, _OS, _Emitter, RelaxAll); return createMachOStreamer(Ctx, TAB, _OS, _Emitter, RelaxAll);
case Triple::MinGW32: case Triple::MinGW32:
case Triple::MinGW64:
case Triple::Cygwin: case Triple::Cygwin:
case Triple::Win32: case Triple::Win32:
if (TheTriple.getEnvironment() == Triple::MachO) if (TheTriple.getEnvironment() == Triple::MachO)

View File

@ -1,4 +1,4 @@
; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s ; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s
; CHECK-NOT: -{{[1-9][0-9]*}}(%rsp) ; CHECK-NOT: -{{[1-9][0-9]*}}(%rsp)
define x86_fp80 @a(i64 %x) nounwind readnone { define x86_fp80 @a(i64 %x) nounwind readnone {

View File

@ -1,4 +1,4 @@
; RUN: llc -mtriple=x86_64-pc-mingw64 < %s | FileCheck %s ; RUN: llc -mtriple=x86_64-mingw32 < %s | FileCheck %s
; CHECK: subq $40, %rsp ; CHECK: subq $40, %rsp
; CHECK: movaps %xmm8, (%rsp) ; CHECK: movaps %xmm8, (%rsp)
; CHECK: movaps %xmm7, 16(%rsp) ; CHECK: movaps %xmm7, 16(%rsp)