Skip to content

[llvm-objcopy] Always update indirectsymoff in MachO #117726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2024
Merged

[llvm-objcopy] Always update indirectsymoff in MachO #117726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,10 @@ Error MachOLayoutBuilder::layoutTail(uint64_t Offset) {
MLC.dysymtab_command_data.nextrel != 0)
return createStringError(llvm::errc::not_supported,
"shared library is not yet supported");

if (!O.IndirectSymTable.Symbols.empty()) {
MLC.dysymtab_command_data.indirectsymoff = StartOfIndirectSymbols;
MLC.dysymtab_command_data.nindirectsyms =
O.IndirectSymTable.Symbols.size();
}

MLC.dysymtab_command_data.indirectsymoff =
O.IndirectSymTable.Symbols.size() ? StartOfIndirectSymbols : 0;
MLC.dysymtab_command_data.nindirectsyms =
O.IndirectSymTable.Symbols.size();
updateDySymTab(MLC);
break;
}
Expand Down
48 changes: 48 additions & 0 deletions llvm/test/tools/llvm-objcopy/MachO/dysymtab-zero-indirectsym.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
## Show that llvm-strip correctly zeroes out indirectsymoff and indirectsyms
## in LC_DYSYMTAB if there are no symbols
#
# RUN: yaml2obj %s -o %t
# RUN: llvm-strip --strip-all %t -o %t.stripped
# RUN: obj2yaml %t.stripped | FileCheck %s

# CHECK: indirectsymoff: 0
# CHECK-NEXT: nindirectsyms: 0

--- !mach-o
FileHeader:
magic: 0xFEEDFACF
cputype: 0x01000007
cpusubtype: 0x80000003
filetype: 0x00000002
ncmds: 2
sizeofcmds: 104
flags: 0x00200085
reserved: 0x00000000
LoadCommands:
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 0
nsyms: 0
stroff: 0
strsize: 0
- cmd: LC_DYSYMTAB
cmdsize: 80
ilocalsym: 0
nlocalsym: 0
iextdefsym: 0
nextdefsym: 0
iundefsym: 0
nundefsym: 0
tocoff: 0
ntoc: 0
modtaboff: 0
nmodtab: 0
extrefsymoff: 0
nextrefsyms: 0
indirectsymoff: 42
nindirectsyms: 0
extreloff: 0
nextrel: 0
locreloff: 0
nlocrel: 0
...