Skip to content

S
swiftshader
Commit ae6e12ca by JF Bastien
Options

Fix subzero Windows build

MinGW's GCC 4.8.1 was sad because SectionType was shadowing the other SectionType. Also, the enum's values are in the ELFObjectWriter namespace, not ELFObjectWriter::SectionType. R=stichnot@chromium.org, jvoung@chromium.org BUG= Windows build is sad Review URL: https://codereview.chromium.org/891953002
parent 380d7b96
Showing with 10 additions and 11 deletions
src/IceELFObjectWriter.cpp
...@@ -282,7 +282,7 @@ void partitionGlobalsBySection(const VariableDeclarationList &Vars, ...@@ -282,7 +282,7 @@ void partitionGlobalsBySection(const VariableDeclarationList &Vars,
for (VariableDeclaration *Var : Vars) { for (VariableDeclaration *Var : Vars) {
if (GlobalContext::matchSymbolName(Var->getName(), TranslateOnly)) { if (GlobalContext::matchSymbolName(Var->getName(), TranslateOnly)) {
size_t Section = classifyGlobalSection(Var); size_t Section = classifyGlobalSection(Var);
assert(Section < ELFObjectWriter::SectionType::NumSectionTypes); assert(Section < ELFObjectWriter::NumSectionTypes);
VarsBySection[Section].push_back(Var); VarsBySection[Section].push_back(Var);
} }
} }
...@@ -305,7 +305,7 @@ void ELFObjectWriter::writeDataSection(const VariableDeclarationList &Vars, ...@@ -305,7 +305,7 @@ void ELFObjectWriter::writeDataSection(const VariableDeclarationList &Vars,
} }
} }
void ELFObjectWriter::writeDataOfType(SectionType SectionType, void ELFObjectWriter::writeDataOfType(SectionType ST,
const VariableDeclarationList &Vars, const VariableDeclarationList &Vars,
FixupKind RelocationKind, bool IsELF64) { FixupKind RelocationKind, bool IsELF64) {
ELFDataSection *Section; ELFDataSection *Section;
...@@ -319,8 +319,8 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType, ...@@ -319,8 +319,8 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType,
} }
const Elf64_Xword ShEntsize = 0; // non-uniform data element size. const Elf64_Xword ShEntsize = 0; // non-uniform data element size.
// Lift this out, so it can be re-used if we do fdata-sections? // Lift this out, so it can be re-used if we do fdata-sections?
switch (SectionType) { switch (ST) {
case SectionType::ROData: { case ROData: {
SectionName = ".rodata"; SectionName = ".rodata";
// Only expecting to write the data sections all in one shot for now. // Only expecting to write the data sections all in one shot for now.
assert(RODataSections.empty()); assert(RODataSections.empty());
...@@ -333,7 +333,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType, ...@@ -333,7 +333,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType,
RelRODataSections.push_back(RelSection); RelRODataSections.push_back(RelSection);
break; break;
} }
case SectionType::Data: { case Data: {
SectionName = ".data"; SectionName = ".data";
assert(DataSections.empty()); assert(DataSections.empty());
const Elf64_Xword ShFlags = SHF_ALLOC | SHF_WRITE; const Elf64_Xword ShFlags = SHF_ALLOC | SHF_WRITE;
...@@ -345,7 +345,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType, ...@@ -345,7 +345,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType,
RelDataSections.push_back(RelSection); RelDataSections.push_back(RelSection);
break; break;
} }
case SectionType::BSS: { case BSS: {
SectionName = ".bss"; SectionName = ".bss";
assert(BSSSections.empty()); assert(BSSSections.empty());
const Elf64_Xword ShFlags = SHF_ALLOC | SHF_WRITE; const Elf64_Xword ShFlags = SHF_ALLOC | SHF_WRITE;
...@@ -355,7 +355,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType, ...@@ -355,7 +355,7 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType,
BSSSections.push_back(Section); BSSSections.push_back(Section);
break; break;
} }
case SectionType::NumSectionTypes: case NumSectionTypes:
llvm::report_fatal_error("Unknown SectionType"); llvm::report_fatal_error("Unknown SectionType");
break; break;
} }
...@@ -372,14 +372,13 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType, ...@@ -372,14 +372,13 @@ void ELFObjectWriter::writeDataOfType(SectionType SectionType,
Section->getCurrentSize(), SymbolSize); Section->getCurrentSize(), SymbolSize);
StrTab->add(MangledName); StrTab->add(MangledName);
if (!Var->hasNonzeroInitializer()) { if (!Var->hasNonzeroInitializer()) {
assert(SectionType == SectionType::BSS || assert(ST == BSS || ST == ROData);
SectionType == SectionType::ROData); if (ST == ROData)
if (SectionType == SectionType::ROData)
Section->appendZeros(Str, SymbolSize); Section->appendZeros(Str, SymbolSize);
else else
Section->setSize(Section->getCurrentSize() + SymbolSize); Section->setSize(Section->getCurrentSize() + SymbolSize);
} else { } else {
assert(SectionType != SectionType::BSS); assert(ST != BSS);
for (VariableDeclaration::Initializer *Init : Var->getInitializers()) { for (VariableDeclaration::Initializer *Init : Var->getInitializers()) {
switch (Init->getKind()) { switch (Init->getKind()) {
case VariableDeclaration::Initializer::DataInitializerKind: { case VariableDeclaration::Initializer::DataInitializerKind: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment