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 | 70ece0ada7f221b089183142440f927fa2ea3b1b (patch) | |
tree | d30ef974b52c2e0bead727bd9be00e31c6f0209c /lib/Target/X86 | |
parent | 1d9ab2556024514c403135bb8fe5da34fc4f0c63 (diff) | |
download | llvm-70ece0ada7f221b089183142440f927fa2ea3b1b.tar.gz llvm-70ece0ada7f221b089183142440f927fa2ea3b1b.tar.bz2 llvm-70ece0ada7f221b089183142440f927fa2ea3b1b.tar.xz |
[x86] Support i386-*-*-code16 triple for emitting 16-bit code
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199648 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86')
-rw-r--r-- | lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 5 | ||||
-rw-r--r-- | lib/Target/X86/X86Subtarget.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index 9d5ff1027c..fd79c6aea2 100644 --- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/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/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp index 6f724b42d9..16161cfbd8 100644 --- a/lib/Target/X86/X86Subtarget.cpp +++ b/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); } |