summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Iskhodzhanov <timurrrr@google.com>2014-04-16 08:30:32 +0000
committerTimur Iskhodzhanov <timurrrr@google.com>2014-04-16 08:30:32 +0000
commit42b1b517ced5bc8ad68935a87897c6103e1e5b9d (patch)
treeaed5287709f134ea349da5723da6d739f0428b35
parenta8931a4f8cb2c64cec38139b08c23e9020298fc4 (diff)
downloadbcm5719-llvm-42b1b517ced5bc8ad68935a87897c6103e1e5b9d.tar.gz
bcm5719-llvm-42b1b517ced5bc8ad68935a87897c6103e1e5b9d.zip
Simplify a static_assert so VS2013 can build it
llvm-svn: 206363
-rw-r--r--llvm/lib/MC/WinCOFFObjectWriter.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp
index 27dc5a12a69..8e5377980d7 100644
--- a/llvm/lib/MC/WinCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp
@@ -632,8 +632,10 @@ void WinCOFFObjectWriter::ExecutePostLayoutBinding(MCAssembler &Asm,
const MCAsmLayout &Layout) {
// "Define" each section & symbol. This creates section & symbol
// entries in the staging area.
-
- static_assert(sizeof(COFF::AuxiliaryFile::FileName) == COFF::SymbolSize,
+ // FIXME: this used to be
+ // sizeof(COFF::AuxiliaryFile::FileName) == COFF::SymbolSize
+ // but VS2013 can't compile that.
+ static_assert(sizeof(COFF::AuxiliaryFile) == COFF::SymbolSize,
"size mismatch for COFF::AuxiliaryFile::FileName");
for (auto FI = Asm.file_names_begin(), FE = Asm.file_names_end();
FI != FE; ++FI) {
OpenPOWER on IntegriCloud