diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2014-01-20 12:02:25 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2014-01-20 12:02:25 +0000 |
| commit | 71d15edaf311c3fa05072e8731bb0b1437f00eec (patch) | |
| tree | 77ee4bcb596dcdbd55584e15a58d4ea5761ceb17 /llvm/lib | |
| parent | 4d35631a6c1d572ddae962330400c93e1e74c250 (diff) | |
| download | bcm5719-llvm-71d15edaf311c3fa05072e8731bb0b1437f00eec.tar.gz bcm5719-llvm-71d15edaf311c3fa05072e8731bb0b1437f00eec.zip | |
[x86] Support i386-*-*-code16 triple for emitting 16-bit code
llvm-svn: 199648
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 273316a0a6f..1947f43aa11 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -149,6 +149,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) { case GNUEABIHF: return "gnueabihf"; case GNUEABI: return "gnueabi"; case GNUX32: return "gnux32"; + case CODE16: return "code16"; case EABI: return "eabi"; case EABIHF: return "eabihf"; case MachO: return "macho"; @@ -303,6 +304,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) { .StartsWith("gnueabihf", Triple::GNUEABIHF) .StartsWith("gnueabi", Triple::GNUEABI) .StartsWith("gnux32", Triple::GNUX32) + .StartsWith("code16", Triple::CODE16) .StartsWith("gnu", Triple::GNU) .StartsWith("macho", Triple::MachO) .StartsWith("android", Triple::Android) diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 9d5ff1027cd..fd79c6aea2e 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp @@ -48,8 +48,11 @@ std::string X86_MC::ParseX86Triple(StringRef TT) { std::string FS; if (TheTriple.getArch() == Triple::x86_64) FS = "+64bit-mode,-32bit-mode,-16bit-mode"; - else + else if (TheTriple.getEnvironment() != Triple::CODE16) FS = "-64bit-mode,+32bit-mode,-16bit-mode"; + else + FS = "-64bit-mode,-32bit-mode,+16bit-mode"; + return FS; } diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index 6f724b42d97..16161cfbd8f 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -558,8 +558,10 @@ X86Subtarget::X86Subtarget(const std::string &TT, const std::string &CPU, , TargetTriple(TT) , StackAlignOverride(StackAlignOverride) , In64BitMode(TargetTriple.getArch() == Triple::x86_64) - , In32BitMode(TargetTriple.getArch() == Triple::x86) - , In16BitMode(false) { + , In32BitMode(TargetTriple.getArch() == Triple::x86 && + TargetTriple.getEnvironment() != Triple::CODE16) + , In16BitMode(TargetTriple.getArch() == Triple::x86 && + TargetTriple.getEnvironment() == Triple::CODE16) { initializeEnvironment(); resetSubtargetFeatures(CPU, FS); } |
