diff options
| author | Reid Kleckner <reid@kleckner.net> | 2015-04-01 16:45:06 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2015-04-01 16:45:06 +0000 |
| commit | 7510c09234fbb26b6884b4badedfe04d8a6f8aa4 (patch) | |
| tree | dd338aee0e46d08b6fec90854f02ef2c87c283ae /clang/lib/Basic/Targets.cpp | |
| parent | 5e4fc4e88404498c2f74498bb259e272b6c3e8bf (diff) | |
| download | bcm5719-llvm-7510c09234fbb26b6884b4badedfe04d8a6f8aa4.tar.gz bcm5719-llvm-7510c09234fbb26b6884b4badedfe04d8a6f8aa4.zip | |
Fix data layout mismatch between LLVM and Clang for i686-pc-windows-msvc-elf
Do the same thing as win64. If we're not using COFF, use the ELF
manglings. Maybe if we are targetting *-windows-msvc-macho, we should
use darwin manglings, but I don't need to stir that pot today.
llvm-svn: 233819
Diffstat (limited to 'clang/lib/Basic/Targets.cpp')
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 96dda54edb9..89ce202e9b7 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -3434,7 +3434,10 @@ public: : WindowsTargetInfo<X86_32TargetInfo>(Triple) { WCharType = UnsignedShort; DoubleAlign = LongLongAlign = 64; - DescriptionString = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-S32"; + bool IsWinCOFF = + getTriple().isOSWindows() && getTriple().isOSBinFormatCOFF(); + DescriptionString = IsWinCOFF ? "e-m:x-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 { |
