Skip to content
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

[llvm-lib] Don't rewrite paths for members in non-thin archives #123416

Merged
merged 1 commit into from
Jan 21, 2025
Merged

[llvm-lib] Don't rewrite paths for members in non-thin archives #123416

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
21 changes: 10 additions & 11 deletions llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,23 +503,22 @@ int llvm::libDriverMain(ArrayRef<const char *> ArgsArr) {
return 1;
}
}
// llvm-lib uses relative paths for both regular and thin archives, unlike
// standard GNU ar, which only uses relative paths for thin archives and
// basenames for regular archives.
for (NewArchiveMember &Member : Members) {
if (sys::path::is_relative(Member.MemberName)) {
Expected<std::string> PathOrErr =
computeArchiveRelativePath(OutputPath, Member.MemberName);
if (PathOrErr)
Member.MemberName = Saver.save(*PathOrErr);

bool Thin = Args.hasArg(OPT_llvmlibthin);
if (Thin) {
for (NewArchiveMember &Member : Members) {
if (sys::path::is_relative(Member.MemberName)) {
Expected<std::string> PathOrErr =
computeArchiveRelativePath(OutputPath, Member.MemberName);
if (PathOrErr)
Member.MemberName = Saver.save(*PathOrErr);
}
}
}

// For compatibility with MSVC, reverse member vector after de-duplication.
std::reverse(Members.begin(), Members.end());

bool Thin = Args.hasArg(OPT_llvmlibthin);

auto Symtab = Args.hasFlag(OPT_llvmlibindex, OPT_llvmlibindex_no,
/*default=*/true)
? SymtabWritingMode::NormalSymtab
Expand Down
37 changes: 37 additions & 0 deletions llvm/test/tools/llvm-lib/member-names.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
RUN: rm -rf %t
RUN: mkdir -p %t/foo
RUN: split-file %s %t
RUN: cd %t

RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o foo/obj.o %S/Inputs/a.s

# For a regular, non-thin archive, check that we store the path in the form
# it was passed (foo/obj.o), not as a path relative to the archive.
RUN: llvm-lib -out:foo/regular.a foo/obj.o
RUN: llvm-lib -list foo/regular.a | FileCheck %s --check-prefix=REGULAR --match-full-lines
REGULAR: foo/obj.o

# When merging two import libraries, make sure that the member names stay
# unchanged.
RUN: llvm-lib -machine:x64 -out:foo.lib -def:foo.def
RUN: llvm-lib -machine:x64 -out:bar.lib -def:bar.def
RUN: llvm-lib -out:foo/merged.lib foo.lib bar.lib
RUN: llvm-lib -list foo/merged.lib | FileCheck %s --check-prefix=MERGED --match-full-lines
MERGED: foo.dll
MERGED: foo.dll
MERGED: foo.dll
MERGED: foo.dll
MERGED: bar.dll
MERGED: bar.dll
MERGED: bar.dll
MERGED: bar.dll

#--- foo.def
LIBRARY foo.dll
EXPORTS
func1

#--- bar.def
LIBRARY bar.dll
EXPORTS
func2
Loading