1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00

Revert "[llvm-objcopy][MachO] Minor code cleanup"

This reverts commit c94cf97b53566a26245c54ea0c41b0dc83daf8a0
since it appears to have broken linaro-clang-armv7-quick build bot
and needs further investigation.
This commit is contained in:
Alexander Shaposhnikov 2021-06-29 01:18:48 -07:00
parent 2bd098b59e
commit 80b24cf0f0

View File

@ -28,7 +28,7 @@ void MachOReader::readHeader(Object &O) const {
}
template <typename SectionType>
static Section constructSectionCommon(const SectionType &Sec, uint32_t Index) {
static Section constructSectionCommon(SectionType Sec, uint32_t Index) {
StringRef SegName(Sec.segname, strnlen(Sec.segname, sizeof(Sec.segname)));
StringRef SectName(Sec.sectname, strnlen(Sec.sectname, sizeof(Sec.sectname)));
Section S(SegName, SectName);
@ -46,11 +46,14 @@ static Section constructSectionCommon(const SectionType &Sec, uint32_t Index) {
return S;
}
static Section constructSection(const MachO::section &Sec, uint32_t Index) {
template <typename SectionType>
Section constructSection(SectionType Sec, uint32_t Index);
template <> Section constructSection(MachO::section Sec, uint32_t Index) {
return constructSectionCommon(Sec, Index);
}
static Section constructSection(const MachO::section_64 &Sec, uint32_t Index) {
template <> Section constructSection(MachO::section_64 Sec, uint32_t Index) {
Section S = constructSectionCommon(Sec, Index);
S.Reserved3 = Sec.reserved3;
return S;