commit 71d15edaf311c3fa05072e8731bb0b1437f00eec
author David Woodhouse <dwmw2@infradead.org> Mon Jan 20 12:02:25 2014 +0000
committer David Woodhouse <dwmw2@infradead.org> Mon Jan 20 12:02:25 2014 +0000
tree 77ee4bcb596dcdbd55584e15a58d4ea5761ceb17
parent 4d35631a6c1d572ddae962330400c93e1e74c250

[x86] Support i386-*-*-code16 triple for emitting 16-bit code

llvm-svn: 199648

llvm/lib/Target/X86/X86Subtarget.cpp

diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp
index 6f724b4..16161cf 100644
--- a/llvm/lib/Target/X86/X86Subtarget.cpp
+++ b/llvm/lib/Target/X86/X86Subtarget.cpp
@@ -558,8 +558,10 @@
   , 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);
 }