Skip to content

[lld][ELF] Only convert dependency filename to native form on Windows #160927

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+42 −11
Open

[lld][ELF] Only convert dependency filename to native form on Windows #160927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46d6a53
[lld][ELF] Only convert dependency filename to native form on Windows
ZhongRuoyu Sep 26, 2025
b59f1f8
[lld][ELF] Check indentation in dependency file tests
ZhongRuoyu Oct 20, 2025
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: 8 additions & 3 deletions lld/ELF/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2483,10 +2483,14 @@ static void writeDependencyFile(Ctx &ctx) {
// We use the same escape rules as Clang/GCC which are accepted by Make/Ninja:
// * A space is escaped by a backslash which itself must be escaped.
// * A hash sign is escaped by a single backslash.
// * $ is escapes as $$.
// * $ is escaped as $$.
auto printFilename = [](raw_fd_ostream &os, StringRef filename) {
llvm::SmallString<256> nativePath;
#ifdef _WIN32
llvm::sys::path::native(filename.str(), nativePath);
#else
nativePath = filename;
#endif
llvm::sys::path::remove_dots(nativePath, /*remove_dot_dot=*/true);
for (unsigned i = 0, e = nativePath.size(); i != e; ++i) {
if (nativePath[i] == '#') {
Expand All @@ -2503,9 +2507,10 @@ static void writeDependencyFile(Ctx &ctx) {
}
};

os << ctx.arg.outputFile << ":";
printFilename(os, ctx.arg.outputFile);
os << ":";
for (StringRef path : ctx.arg.dependencyFiles) {
os << " \\\n ";
os << " \\\n ";
printFilename(os, path);
}
os << "\n";
Expand Down
13 changes: 13 additions & 0 deletions lld/test/ELF/dependency-file-backslash-as-normal-char.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# REQUIRES: x86, !system-windows
# RUN: mkdir -p %t
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o "%t/back\\slash.o"
# RUN: ld.lld -o %t/foo.exe "%t/back\\slash.o" --dependency-file=%t/foo.d
# RUN: FileCheck --match-full-lines -DFILE=%t %s < %t/foo.d

# CHECK: [[FILE]]/foo.exe: \
# CHECK-NEXT: [[FILE]]/back\slash.o
Copy link
Member

@MaskRay MaskRay Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs --match-full-lines --strict-whitespace to actually test the indentation.

Copy link
Member Author

@ZhongRuoyu ZhongRuoyu Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed in b59f1f8. The structure of these two tests was copied from lld/test/ELF/dependency-file.s so I updated that as well.

# CHECK-EMPTY:
# CHECK-NEXT: [[FILE]]/back\slash.o:

.global _start
_start:
13 changes: 13 additions & 0 deletions lld/test/ELF/dependency-file-backslash-as-path-separator.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# REQUIRES: x86, system-windows
# RUN: mkdir -p %t/back
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o "%t/back\\slash.o"
# RUN: ld.lld -o %t/foo.exe "%t/back\\slash.o" --dependency-file=%t/foo.d
# RUN: FileCheck --match-full-lines -DFILE=%t %s < %t/foo.d

# CHECK: [[FILE]]\foo.exe: \
# CHECK-NEXT: [[FILE]]\back\slash.o
# CHECK-EMPTY:
# CHECK-NEXT: [[FILE]]\back\slash.o:

.global _start
_start: