[llvm-objcopy][MachO] Correctly identify object file endianness.
The header magic value is held in the native endianness, so the method used in
cc0ec3fdb9d. Use MachOReader / MachOWriter's existing endianness tests instead.
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
index e2eeee4..6d08e3a 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOReader.cpp
@@ -206,7 +206,7 @@
for (auto &Reloc : Sec->Relocations)
if (!Reloc.Scattered)
Reloc.Symbol = O.SymTable.getSymbolByIndex(
- Reloc.getPlainRelocationSymbolNum(O.isLittleEndian()));
+ Reloc.getPlainRelocationSymbolNum(MachOObj.isLittleEndian()));
}
void MachOReader::readRebaseInfo(Object &O) const {
diff --git a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
index a08d54d..db31ef5 100644
--- a/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
+++ b/llvm/tools/llvm-objcopy/MachO/MachOWriter.cpp
@@ -242,7 +242,7 @@
auto RelocInfo = Sec->Relocations[Index];
if (!RelocInfo.Scattered)
RelocInfo.setPlainRelocationSymbolNum(RelocInfo.Symbol->Index,
- O.isLittleEndian());
+ IsLittleEndian);
if (IsLittleEndian != sys::IsLittleEndianHost)
MachO::swapStruct(
diff --git a/llvm/tools/llvm-objcopy/MachO/Object.h b/llvm/tools/llvm-objcopy/MachO/Object.h
index c834105..d0d4554 100644
--- a/llvm/tools/llvm-objcopy/MachO/Object.h
+++ b/llvm/tools/llvm-objcopy/MachO/Object.h
@@ -314,11 +314,6 @@
/// is not too long (SegName.size() should be less than or equal to 16).
LoadCommand &addSegment(StringRef SegName);
- bool isLittleEndian() const {
- StringRef Magic(reinterpret_cast<const char *>(&Header.Magic), 4);
- return Magic == "\xCE\xFA\xED\xFE" || Magic == "\xCF\xFA\xED\xFE";
- }
-
bool is64Bit() const {
return Header.Magic == MachO::MH_MAGIC_64 ||
Header.Magic == MachO::MH_CIGAM_64;