diff options
| author | Reid Kleckner <reid@kleckner.net> | 2015-04-01 17:09:33 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2015-04-01 17:09:33 +0000 |
| commit | de0839be7f7147cffef9fd8566c6587582e3f3d2 (patch) | |
| tree | 2fef00b5689e77c1a8c0e6f0ee36fbd773a780fa /lib/Basic/Targets.cpp | |
| parent | 5833c600987dae49881ad224364b994f06325dec (diff) | |
Merge r233819 into the release 36 branch with some modifications
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_36@233823 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/Targets.cpp')
| -rw-r--r-- | lib/Basic/Targets.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index dc844bf221..e22252a39c 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -3362,7 +3362,10 @@ public: : WindowsTargetInfo<X86_32TargetInfo>(Triple) { WCharType = UnsignedShort; DoubleAlign = LongLongAlign = 64; - DescriptionString = "e-m:w-p:32:32-i64:64-f80:32-n8:16:32-S32"; + bool IsWinCOFF = + getTriple().isOSWindows() && getTriple().isOSBinFormatCOFF(); + DescriptionString = IsWinCOFF ? "e-m:w-p:32:32-i64:64-f80:32-n8:16:32-S32" + : "e-m:e-p:32:32-i64:64-f80:32-n8:16:32-S32"; } void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const override { |