[clang] f0ad2e9 - [Driver] Make use of AddFilePathLibArgs() on NetBSD. (#71371)

[via cfe-commits]

Author: Brad Smith
Date: 2023-11-15T13:36:16-05:00
New Revision: f0ad2e9fda5f78149198f67461e417d101318df5

URL: https://github.com/llvm/llvm-project/commit/f0ad2e9fda5f78149198f67461e417d101318df5
DIFF: https://github.com/llvm/llvm-project/commit/f0ad2e9fda5f78149198f67461e417d101318df5.diff

LOG: [Driver] Make use of AddFilePathLibArgs() on NetBSD. (#71371)

This will help using lld or mold as a linker.

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/NetBSD.cpp
    clang/test/Driver/netbsd.c

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/NetBSD.cpp b/clang/lib/Driver/ToolChains/NetBSD.cpp
index ffc4742b6c4e7d4..240bf5764b9cce2 100644
--- a/clang/lib/Driver/ToolChains/NetBSD.cpp
+++ b/clang/lib/Driver/ToolChains/NetBSD.cpp
@@ -269,6 +269,7 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
 
   Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
                             options::OPT_s, options::OPT_t, options::OPT_r});
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);

diff  --git a/clang/test/Driver/netbsd.c b/clang/test/Driver/netbsd.c
index 760cba4ac4e0c9f..1452e9e2dc6e3c0 100644
--- a/clang/test/Driver/netbsd.c
+++ b/clang/test/Driver/netbsd.c
@@ -134,6 +134,7 @@
 // STATIC-NOT: "-shared"
 // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
 // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
+// STATIC: "-L{{.*}}/usr/lib"
 // STATIC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // STATIC-PIE: ld{{.*}}" "--eh-frame-hdr"
@@ -144,6 +145,7 @@
 // STATIC-PIE-NOT: "-shared"
 // STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
 // STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
+// STATIC-PIE: "-L{{.*}}/usr/lib"
 // STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // SHARED: ld{{.*}}" "--eh-frame-hdr"
@@ -151,6 +153,7 @@
 // SHARED-NOT: "-dynamic-linker"
 // SHARED-NOT: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
 // SHARED: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
+// SHARED: "-L{{.*}}/usr/lib"
 // SHARED: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
 
 // PIE: ld{{.*}}" "--eh-frame-hdr"
@@ -159,6 +162,7 @@
 // PIE-NOT: "-shared"
 // PIE: "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
 // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
+// PIE: "-L{{.*}}/usr/lib"
 // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o"
 // PIE: "{{.*}}/usr/lib{{/|\\\\}}crtn.o"