Fix build break after rebase
diff --git a/lib/LD/ELFObjectWriter.cpp b/lib/LD/ELFObjectWriter.cpp
index d3f8756..390dea3 100644
--- a/lib/LD/ELFObjectWriter.cpp
+++ b/lib/LD/ELFObjectWriter.cpp
@@ -88,7 +88,6 @@
}
// Write out sections with data
-<<<<<<< HEAD
switch (section->kind()) {
case LDFileFormat::GCCExceptTable:
case LDFileFormat::TEXT:
@@ -110,40 +109,10 @@
target().emitSectionData(*section, region);
break;
case LDFileFormat::DebugString:
- if (pModule.getDebugString().isSuccess())
- pModule.getDebugString().emit(region);
- else
- emitSectionData(*section, region);
+ section->getDebugString()->emit(region);
break;
default:
llvm_unreachable("invalid section kind");
-=======
- switch(section->kind()) {
- case LDFileFormat::GCCExceptTable:
- case LDFileFormat::TEXT:
- case LDFileFormat::DATA:
- case LDFileFormat::Debug:
- case LDFileFormat::Note:
- emitSectionData(*section, region);
- break;
- case LDFileFormat::EhFrame:
- emitEhFrame(pModule, *section->getEhFrame(), region);
- break;
- case LDFileFormat::Relocation:
- // sort relocation for the benefit of the dynamic linker.
- target().sortRelocation(*section);
-
- emitRelocation(m_Config, *section, region);
- break;
- case LDFileFormat::Target:
- target().emitSectionData(*section, region);
- break;
- case LDFileFormat::DebugString:
- section->getDebugString()->emit(region);
- break;
- default:
- llvm_unreachable("invalid section kind");
->>>>>>> debug info: Refine the flow of handling the .debug_str merging
}
}
diff --git a/lib/LD/LDSection.cpp b/lib/LD/LDSection.cpp
index b423338..b944a8e 100644
--- a/lib/LD/LDSection.cpp
+++ b/lib/LD/LDSection.cpp
@@ -99,8 +99,9 @@
return (m_Data.eh_frame != NULL);
}
-bool LDSection::hasDebugString() const
-{
+bool LDSection::hasDebugString() const {
assert(LDFileFormat::DebugString == kind());
return (NULL != m_Data.debug_string);
}
+
+} // namespace mcld
diff --git a/lib/Object/ObjectLinker.cpp b/lib/Object/ObjectLinker.cpp
index fff754b..7a77a51 100644
--- a/lib/Object/ObjectLinker.cpp
+++ b/lib/Object/ObjectLinker.cpp
@@ -438,20 +438,20 @@
// section index. However, .debug_str actually does not need symobl in
// shrad/executable objects, so it's fine to do so.
if (pInfo.outSymbol()->hasFragRef() &&
- LDFileFormat::Ignore ==
- pInfo.outSymbol()
- ->fragRef()
- ->frag()
- ->getParent()
- ->getSection()
- .kind() ||
- LDFileFormat::DebugString ==
- pInfo.outSymbol()
- ->fragRef()
- ->frag()
- ->getParent()
- ->getSection()
- .kind())
+ (LDFileFormat::Ignore ==
+ pInfo.outSymbol()
+ ->fragRef()
+ ->frag()
+ ->getParent()
+ ->getSection()
+ .kind() ||
+ LDFileFormat::DebugString ==
+ pInfo.outSymbol()
+ ->fragRef()
+ ->frag()
+ ->getParent()
+ ->getSection()
+ .kind()))
return;
if (pInfo.shouldForceLocal(m_Config))
diff --git a/lib/Target/X86/X86Relocator.h b/lib/Target/X86/X86Relocator.h
index 7c071ba..3c6ce7e 100644
--- a/lib/Target/X86/X86Relocator.h
+++ b/lib/Target/X86/X86Relocator.h
@@ -213,9 +213,6 @@
/// access a function pointer.
virtual bool mayHaveFunctionPointerAccess(const Relocation& pReloc) const;
-<<<<<<< HEAD
- private:
-=======
/// getDebugStringOffset - get the offset from the relocation target. This is
/// used to get the debug string offset.
uint32_t getDebugStringOffset(Relocation& pReloc) const;
@@ -225,7 +222,6 @@
void applyDebugStringOffset(Relocation& pReloc, uint32_t pOffset);
private:
->>>>>>> debug info: Get and apply debug string offset in backend relocator
void scanLocalReloc(Relocation& pReloc,
IRBuilder& pBuilder,
Module& pModule,
