https://github.com/DanielCChen updated
https://github.com/llvm/llvm-project/pull/134362
>From cd100a70479adbb4619d685e345485eea99987c5 Mon Sep 17 00:00:00 2001
From: Daniel Chen <cdc...@ca.ibm.com>
Date: Fri, 4 Apr 2025 06:10:56 -0400
Subject: [PATCH 1/5] [driver] Generalize adding the path of
libflang_rt.runtime.a.
---
clang/include/clang/Driver/ToolChain.h | 4 ++++
clang/lib/Driver/ToolChain.cpp | 20 ++++++++++++++++++--
clang/lib/Driver/ToolChains/AIX.cpp | 8 --------
clang/lib/Driver/ToolChains/AIX.h | 3 ---
clang/lib/Driver/ToolChains/PPCLinux.cpp | 16 ----------------
clang/lib/Driver/ToolChains/PPCLinux.h | 3 ---
flang/test/Driver/linker-flags.f90 | 2 +-
7 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/clang/include/clang/Driver/ToolChain.h
b/clang/include/clang/Driver/ToolChain.h
index 076e4296c3090..d0059673d6a67 100644
--- a/clang/include/clang/Driver/ToolChain.h
+++ b/clang/include/clang/Driver/ToolChain.h
@@ -521,6 +521,10 @@ class ToolChain {
addFortranRuntimeLibraryPath(const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) const;
+ /// Add the path for libflang_rt.runtime.a
+ void addFlangRTLibPath(const llvm::opt::ArgList &Args,
+ llvm::opt::ArgStringList &CmdArgs) const;
+
const char *getCompilerRTArgString(const llvm::opt::ArgList &Args,
StringRef Component,
FileType Type = ToolChain::FT_Static,
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 36d0ae34dec86..054618a44d7bc 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -816,8 +816,7 @@ void ToolChain::addFortranRuntimeLibs(const ArgList &Args,
if (AsNeeded)
addAsNeededOption(*this, Args, CmdArgs, /*as_needed=*/false);
}
- CmdArgs.push_back("-lflang_rt.runtime");
- addArchSpecificRPath(*this, Args, CmdArgs);
+ addFlangRTLibPath(Args, CmdArgs);
// needs libexecinfo for backtrace functions
if (getTriple().isOSFreeBSD() || getTriple().isOSNetBSD() ||
@@ -850,6 +849,23 @@ void ToolChain::addFortranRuntimeLibraryPath(const
llvm::opt::ArgList &Args,
CmdArgs.push_back(Args.MakeArgString("-L" + DefaultLibPath));
}
+void ToolChain::addFlangRTLibPath(const ArgList &Args,
+ llvm::opt::ArgStringList &CmdArgs) const {
+ // Link static flang_rt.runtime.a or shared flang_rt.runtime.so
+ const char *Path;
+ if (getVFS().exists(Twine(Path = getCompilerRTArgString(
+ Args, "runtime", ToolChain::FT_Static, true))))
+ CmdArgs.push_back(Path);
+ else if (getVFS().exists(
+ Twine(Path = getCompilerRTArgString(
+ Args, "runtime", ToolChain::FT_Shared, true))))
+ CmdArgs.push_back(Path);
+ else {
+ CmdArgs.push_back("-lflang_rt.runtime");
+ addArchSpecificRPath(*this, Args, CmdArgs);
+ }
+}
+
// Android target triples contain a target version. If we don't have libraries
// for the exact target version, we should fall back to the next newest version
// or a versionless path, if any.
diff --git a/clang/lib/Driver/ToolChains/AIX.cpp
b/clang/lib/Driver/ToolChains/AIX.cpp
index 26b9d4c772be6..5dc80bc5a3d25 100644
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -608,14 +608,6 @@ void AIX::addProfileRTLibs(const llvm::opt::ArgList &Args,
ToolChain::addProfileRTLibs(Args, CmdArgs);
}
-void AIX::addFortranRuntimeLibs(const ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const {
- // Link flang_rt.runtime.a. On AIX, the static and shared library are all
- // named .a
- CmdArgs.push_back(
- getCompilerRTArgString(Args, "runtime", ToolChain::FT_Static, true));
-}
-
ToolChain::CXXStdlibType AIX::GetDefaultCXXStdlibType() const {
return ToolChain::CST_Libcxx;
}
diff --git a/clang/lib/Driver/ToolChains/AIX.h
b/clang/lib/Driver/ToolChains/AIX.h
index 17e8370cd1218..8f130f6b54547 100644
--- a/clang/lib/Driver/ToolChains/AIX.h
+++ b/clang/lib/Driver/ToolChains/AIX.h
@@ -87,9 +87,6 @@ class LLVM_LIBRARY_VISIBILITY AIX : public ToolChain {
void addProfileRTLibs(const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) const override;
- void addFortranRuntimeLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
-
CXXStdlibType GetDefaultCXXStdlibType() const override;
RuntimeLibType GetDefaultRuntimeLibType() const override;
diff --git a/clang/lib/Driver/ToolChains/PPCLinux.cpp
b/clang/lib/Driver/ToolChains/PPCLinux.cpp
index 575e88c6ab124..0ed0f91ad166c 100644
--- a/clang/lib/Driver/ToolChains/PPCLinux.cpp
+++ b/clang/lib/Driver/ToolChains/PPCLinux.cpp
@@ -12,7 +12,6 @@
#include "clang/Driver/Options.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
-#include "llvm/Support/VirtualFileSystem.h"
using namespace clang::driver;
using namespace clang::driver::toolchains;
@@ -102,18 +101,3 @@ bool PPCLinuxToolChain::SupportIEEEFloat128(
return GlibcSupportsFloat128((Twine(D.DyldPrefix) + Linker).str()) &&
!(D.CCCIsCXX() && HasUnsupportedCXXLib);
}
-
-void PPCLinuxToolChain::addFortranRuntimeLibs(
- const ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const {
- // Link static flang_rt.runtime.a or shared flang_rt.runtime.so
- const char *Path;
- if (getVFS().exists(Twine(Path = getCompilerRTArgString(
- Args, "runtime", ToolChain::FT_Static, true))))
- CmdArgs.push_back(Path);
- else if (getVFS().exists(
- Twine(Path = getCompilerRTArgString(
- Args, "runtime", ToolChain::FT_Shared, true))))
- CmdArgs.push_back(Path);
- else
- CmdArgs.push_back("-lflang_rt.runtime");
-}
diff --git a/clang/lib/Driver/ToolChains/PPCLinux.h
b/clang/lib/Driver/ToolChains/PPCLinux.h
index 910df3d16e6a5..63adaff6be9c2 100644
--- a/clang/lib/Driver/ToolChains/PPCLinux.h
+++ b/clang/lib/Driver/ToolChains/PPCLinux.h
@@ -24,9 +24,6 @@ class LLVM_LIBRARY_VISIBILITY PPCLinuxToolChain : public
Linux {
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const override;
- void addFortranRuntimeLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
-
private:
bool SupportIEEEFloat128(const Driver &D, const llvm::Triple &Triple,
const llvm::opt::ArgList &Args) const;
diff --git a/flang/test/Driver/linker-flags.f90
b/flang/test/Driver/linker-flags.f90
index 20104276d2e4a..4e62a8c32d360 100644
--- a/flang/test/Driver/linker-flags.f90
+++ b/flang/test/Driver/linker-flags.f90
@@ -2,7 +2,7 @@
! invocation. These libraries are added on top of other standard runtime
! libraries that the Clang driver will include.
-! RUN: %flang -### --target=ppc64le-linux-gnu %S/Inputs/hello.f90 2>&1 |
FileCheck %s --check-prefixes=CHECK,UNIX,UNIX-F128NONE
+! RUN: %flang -### --target=ppc64le-linux-gnu %S/Inputs/hello.f90 2>&1 |
FileCheck %s --check-prefixes=CHECK,UNIX,UNIX-F128%f128-lib
! RUN: %flang -### --target=aarch64-apple-darwin %S/Inputs/hello.f90 2>&1 |
FileCheck %s --check-prefixes=CHECK,DARWIN,DARWIN-F128%f128-lib
! RUN: %flang -### --target=sparc-sun-solaris2.11 %S/Inputs/hello.f90 2>&1 |
FileCheck %s --check-prefixes=CHECK,UNIX,SOLARIS-F128%f128-lib
! RUN: %flang -### --target=x86_64-unknown-freebsd %S/Inputs/hello.f90 2>&1 |
FileCheck %s --check-prefixes=CHECK,BSD,BSD-F128%f128-lib
>From a4ccdd88855868eb436375083ffb2b34d0f32c7f Mon Sep 17 00:00:00 2001
From: Daniel Chen <cdc...@ca.ibm.com>
Date: Sun, 6 Apr 2025 21:14:04 -0400
Subject: [PATCH 2/5] Need to pass rpath when linking shared flang-rt.
---
clang/lib/Driver/ToolChain.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 054618a44d7bc..12c517525b0aa 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -856,12 +856,13 @@ void ToolChain::addFlangRTLibPath(const ArgList &Args,
if (getVFS().exists(Twine(Path = getCompilerRTArgString(
Args, "runtime", ToolChain::FT_Static, true))))
CmdArgs.push_back(Path);
- else if (getVFS().exists(
- Twine(Path = getCompilerRTArgString(
- Args, "runtime", ToolChain::FT_Shared, true))))
- CmdArgs.push_back(Path);
else {
- CmdArgs.push_back("-lflang_rt.runtime");
+ if (getVFS().exists(
+ Twine(Path = getCompilerRTArgString(Args, "runtime",
+ ToolChain::FT_Shared, true))))
+ CmdArgs.push_back(Path);
+ else
+ CmdArgs.push_back("-lflang_rt.runtime");
addArchSpecificRPath(*this, Args, CmdArgs);
}
}
>From d95d432a4c51d0d7cd8b87870cf0acaf41d47c72 Mon Sep 17 00:00:00 2001
From: Daniel Chen <cdc...@ca.ibm.com>
Date: Tue, 8 Apr 2025 01:01:27 -0400
Subject: [PATCH 3/5] Add -static-libflangrt and -shared-libflangrt option for
users to specify which flang-rt to link to.
---
clang/include/clang/Driver/Options.td | 7 +++++++
clang/lib/Driver/ToolChain.cpp | 20 +++++++++-----------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 2ca5f99e4ca63..84bff2e2a012c 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -6880,6 +6880,13 @@ let Flags = [TargetSpecific] in {
defm android_pad_segment : BooleanFFlag<"android-pad-segment">, Group<f_Group>;
} // let Flags = [TargetSpecific]
+def shared_libflangrt : Flag<["-"], "shared-libflangrt">,
+ HelpText<"Dynamically link the shared flang-rt">, Group<Link_Group>,
+ Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
+def static_libflangrt : Flag<["-"], "static-libflangrt">,
+ HelpText<"Statically link the static flang-rt">, Group<Link_Group>,
+ Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
+
//===----------------------------------------------------------------------===//
// FLangOption + NoXarchOption
//===----------------------------------------------------------------------===//
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 12c517525b0aa..d4dcbb8e077ce 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -746,7 +746,8 @@ std::string ToolChain::buildCompilerRTBasename(const
llvm::opt::ArgList &Args,
case ToolChain::FT_Shared:
Suffix = TT.isOSWindows()
? (TT.isWindowsGNUEnvironment() ? ".dll.a" : ".lib")
- : ".so";
+ : TT.isOSAIX() ? ".a"
+ : ".so";
break;
}
@@ -852,17 +853,14 @@ void ToolChain::addFortranRuntimeLibraryPath(const
llvm::opt::ArgList &Args,
void ToolChain::addFlangRTLibPath(const ArgList &Args,
llvm::opt::ArgStringList &CmdArgs) const {
// Link static flang_rt.runtime.a or shared flang_rt.runtime.so
- const char *Path;
- if (getVFS().exists(Twine(Path = getCompilerRTArgString(
- Args, "runtime", ToolChain::FT_Static, true))))
- CmdArgs.push_back(Path);
+ // On AIX, default to static flang-rt
+ if (Args.hasFlag(options::OPT_static_libflangrt,
+ options::OPT_shared_libflangrt, getTriple().isOSAIX()))
+ CmdArgs.push_back(
+ getCompilerRTArgString(Args, "runtime", ToolChain::FT_Static, true));
else {
- if (getVFS().exists(
- Twine(Path = getCompilerRTArgString(Args, "runtime",
- ToolChain::FT_Shared, true))))
- CmdArgs.push_back(Path);
- else
- CmdArgs.push_back("-lflang_rt.runtime");
+ CmdArgs.push_back(
+ getCompilerRTArgString(Args, "runtime", ToolChain::FT_Shared, true));
addArchSpecificRPath(*this, Args, CmdArgs);
}
}
>From 83a2770627c52d5c919136aeb63c1c5b90955249 Mon Sep 17 00:00:00 2001
From: Daniel Chen <cdc...@ca.ibm.com>
Date: Tue, 8 Apr 2025 11:04:59 -0400
Subject: [PATCH 4/5] Fixing LIT test and add more coverage for the new option.
---
flang/test/Driver/flang-ld-powerpc.f90 | 119 ++++++++++++++++++++-----
flang/test/Driver/linker-flags.f90 | 13 +--
2 files changed, 102 insertions(+), 30 deletions(-)
diff --git a/flang/test/Driver/flang-ld-powerpc.f90
b/flang/test/Driver/flang-ld-powerpc.f90
index 9a6ee453a22e4..cfbce63f75631 100644
--- a/flang/test/Driver/flang-ld-powerpc.f90
+++ b/flang/test/Driver/flang-ld-powerpc.f90
@@ -7,35 +7,106 @@
!! LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON, use
!! resource_dir_with_per_target_subdir as inputs.
-! Check powerpc64-ibm-aix 64-bit linking to static flang-rt
+! Check powerpc64-ibm-aix 64-bit linking to static flang-rt by default
! RUN: %flang %s -### 2>&1 \
! RUN: --target=powerpc64-ibm-aix \
! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
-! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET
+! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-DEFAULT
-! AIX64-LD-PER-TARGET-NOT: warning:
-! AIX64-LD-PER-TARGET: "-fc1" "-triple" "powerpc64-ibm-aix"
-! AIX64-LD-PER-TARGET-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
-! AIX64-LD-PER-TARGET: "{{.*}}ld{{(.exe)?}}"
-! AIX64-LD-PER-TARGET-NOT: "-bnso"
-! AIX64-LD-PER-TARGET-SAME: "-b64"
-! AIX64-LD-PER-TARGET-SAME: "-bpT:0x100000000" "-bpD:0x110000000"
-! AIX64-LD-PER-TARGET-SAME: "-lc"
-! AIX64-LD-PER-TARGET-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
-! AIX64-LD-PER-TARGET-SAME: "-lm"
-! AIX64-LD-PER-TARGET-SAME: "-lpthread"
+! AIX64-LD-PER-TARGET-DEFAULT-NOT: warning:
+! AIX64-LD-PER-TARGET-DEFAULT: "-fc1" "-triple" "powerpc64-ibm-aix"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-resource-dir"
"[[RESOURCE_DIR:[^"]+]]"
+! AIX64-LD-PER-TARGET-DEFAULT: "{{.*}}ld{{(.exe)?}}"
+! AIX64-LD-PER-TARGET-DEFAULT-NOT: "-bnso"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-b64"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-bpT:0x100000000" "-bpD:0x110000000"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-lc"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-lm"
+! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-lpthread"
-! Check powerpc64le-unknown-linux-gnu 64-bit linking to static flang-rt
+
+! Check powerpc64-ibm-aix 64-bit linking to static flang-rt by option
+! RUN: %flang -static-libflangrt %s -### 2>&1 \
+! RUN: --target=powerpc64-ibm-aix \
+! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
+! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-STATIC
+
+! AIX64-LD-PER-TARGET-STATIC-NOT: warning:
+! AIX64-LD-PER-TARGET-STATIC: "-fc1" "-triple" "powerpc64-ibm-aix"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+! AIX64-LD-PER-TARGET-STATIC: "{{.*}}ld{{(.exe)?}}"
+! AIX64-LD-PER-TARGET-STATIC-NOT: "-bnso"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-b64"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-bpT:0x100000000" "-bpD:0x110000000"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-lc"
+! AIX64-LD-PER-TARGET-STATIC-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-lm"
+! AIX64-LD-PER-TARGET-STATIC-SAME: "-lpthread"
+
+
+! Check powerpc64-ibm-aix 64-bit linking to shared flang-rt by option
+! RUN: %flang -shared-libflangrt %s -### 2>&1 \
+! RUN: --target=powerpc64-ibm-aix \
+! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
+! RUN: | FileCheck %s --check-prefix=AIX64-LD-PER-TARGET-SHARED
+
+! AIX64-LD-PER-TARGET-SHARED-NOT: warning:
+! AIX64-LD-PER-TARGET-SHARED: "-fc1" "-triple" "powerpc64-ibm-aix"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+! AIX64-LD-PER-TARGET-SHARED: "{{.*}}ld{{(.exe)?}}"
+! AIX64-LD-PER-TARGET-SHARED-NOT: "-bnso"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-b64"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-bpT:0x100000000" "-bpD:0x110000000"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-lc"
+! AIX64-LD-PER-TARGET-SHARED-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-lm"
+! AIX64-LD-PER-TARGET-SHARED-SAME: "-lpthread"
+
+
+! Check powerpc64le-unknown-linux-gnu 64-bit linking to shared flang-rt by
default
! RUN: %flang %s -### 2>&1 \
! RUN: --target=powerpc64le-unknown-linux-gnu \
! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
-! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET
-
-! LOP64-LD-PER-TARGET-NOT: warning:
-! LOP64-LD-PER-TARGET: "-fc1" "-triple" "powerpc64le-unknown-linux-gnu"
-! LOP64-LD-PER-TARGET-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
-! LOP64-LD-PER-TARGET: "{{.*}}ld{{(.exe)?}}"
-! LOP64-LD-PER-TARGET-NOT: "-bnso"
-! LOP64-LD-PER-TARGET-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.a"
-! LOP64-LD-PER-TARGET-SAME: "-lm"
-! LOP64-LD-PER-TARGET-SAME: "-lc"
+! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-DEFAULT
+
+! LOP64-LD-PER-TARGET-DEFAULT-NOT: warning:
+! LOP64-LD-PER-TARGET-DEFAULT: "-fc1" "-triple"
"powerpc64le-unknown-linux-gnu"
+! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-resource-dir"
"[[RESOURCE_DIR:[^"]+]]"
+! LOP64-LD-PER-TARGET-DEFAULT: "{{.*}}ld{{(.exe)?}}"
+! LOP64-LD-PER-TARGET-DEFAULT-NOT: "-bnso"
+! LOP64-LD-PER-TARGET-DEFAULT-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.so"
+! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lm"
+! LOP64-LD-PER-TARGET-DEFAULT-SAME: "-lc"
+
+
+! Check powerpc64le-unknown-linux-gnu 64-bit linking to static flang-rt
+! RUN: %flang -static-libflangrt %s -### 2>&1 \
+! RUN: --target=powerpc64le-unknown-linux-gnu \
+! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
+! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-STATIC
+
+! LOP64-LD-PER-TARGET-STATIC-NOT: warning:
+! LOP64-LD-PER-TARGET-STATIC: "-fc1" "-triple"
"powerpc64le-unknown-linux-gnu"
+! LOP64-LD-PER-TARGET-STATIC-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+! LOP64-LD-PER-TARGET-STATIC: "{{.*}}ld{{(.exe)?}}"
+! LOP64-LD-PER-TARGET-STATIC-NOT: "-bnso"
+! LOP64-LD-PER-TARGET-STATIC-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.a"
+! LOP64-LD-PER-TARGET-STATIC-SAME: "-lm"
+! LOP64-LD-PER-TARGET-STATIC-SAME: "-lc"
+
+
+! Check powerpc64le-unknown-linux-gnu 64-bit linking to shared flang-rt
+! RUN: %flang -shared-libflangrt %s -### 2>&1 \
+! RUN: --target=powerpc64le-unknown-linux-gnu \
+! RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_per_target_subdir
\
+! RUN: | FileCheck %s --check-prefixes=LOP64-LD-PER-TARGET-SHARED
+
+! LOP64-LD-PER-TARGET-SHARED-NOT: warning:
+! LOP64-LD-PER-TARGET-SHARED: "-fc1" "-triple"
"powerpc64le-unknown-linux-gnu"
+! LOP64-LD-PER-TARGET-SHARED-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
+! LOP64-LD-PER-TARGET-SHARED: "{{.*}}ld{{(.exe)?}}"
+! AIX64-LD-PER-TARGET-NOT: "-bnso"
+! LOP64-LD-PER-TARGET-SHARED-SAME:
"[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64le-unknown-linux-gnu{{/|\\\\}}libflang_rt.runtime.so"
+! LOP64-LD-PER-TARGET-SHARED-SAME: "-lm"
+! LOP64-LD-PER-TARGET-SHARED-SAME: "-lc"
diff --git a/flang/test/Driver/linker-flags.f90
b/flang/test/Driver/linker-flags.f90
index 4e62a8c32d360..97aca909f2d70 100644
--- a/flang/test/Driver/linker-flags.f90
+++ b/flang/test/Driver/linker-flags.f90
@@ -33,33 +33,34 @@
! SOLARIS-F128NONE-NOT: flang_rt.quadmath
! UNIX-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath"
"--no-as-needed"
! SOLARIS-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "-z" "ignore"
"-lquadmath" "-z" "record"
-! UNIX-SAME: "-lflang_rt.runtime" "-lm"
+! UNIX-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
+! UNIX-SAME: "-lm"
! COMPILER-RT: "{{.*}}{{\\|/}}libclang_rt.builtins.a"
! BSD-LABEL: "{{.*}}ld{{(\.exe)?}}"
! BSD-SAME: "[[object_file]]"
! BSD-F128NONE-NOT: flang_rt.quadmath
! BSD-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath"
"--no-as-needed"
-! BSD-SAME: -lflang_rt.runtime
-! BSD-SAME: -lexecinfo
+! BSD-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
+! BSD-SAME: "-lexecinfo"
! DARWIN-LABEL: "{{.*}}ld{{(\.exe)?}}"
! DARWIN-SAME: "[[object_file]]"
! DARWIN-F128NONE-NOT: libflang_rt.quadmath
! DARWIN-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed"
"-lquadmath" "--no-as-needed"
-! DARWIN-SAME: -lflang_rt.runtime
+! DARWIN-SAME: "{{.*}}{{\\|/}}libclang_rt.runtime_osx_dynamic.dylib"
! HAIKU-LABEL: "{{.*}}ld{{(\.exe)?}}"
! HAIKU-SAME: "[[object_file]]"
! HAIKU-F128NONE-NOT: libflang_rt.quadmath
! HAIKU-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath"
"--no-as-needed"
-! HAIKU-SAME: "-lflang_rt.runtime"
+! HAIKU-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.so"
! MINGW-LABEL: "{{.*}}ld{{(\.exe)?}}"
! MINGW-SAME: "[[object_file]]"
! MINGW-F128NONE-NOT: libflang_rt.quadmath
! MINGW-F128LIBQUADMATH-SAME: "-lflang_rt.quadmath" "--as-needed" "-lquadmath"
"--no-as-needed"
-! MINGW-SAME: -lflang_rt.runtime
+! MINGW-SAME: "{{.*}}{{\\|/}}libflang_rt.runtime.dll.a"
! NOTE: This also matches lld-link (when CLANG_DEFAULT_LINKER=lld) and
! any .exe suffix that is added when resolving to the full path of
>From fc5821a6d8aa004e9904df98cea4289ce09dee6a Mon Sep 17 00:00:00 2001
From: Daniel Chen <cdc...@ca.ibm.com>
Date: Tue, 8 Apr 2025 11:40:01 -0400
Subject: [PATCH 5/5] Address the review comments.
---
clang/include/clang/Driver/Options.td | 4 ++--
clang/lib/Driver/ToolChain.cpp | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 84bff2e2a012c..7d90499ce580d 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -6881,10 +6881,10 @@ defm android_pad_segment :
BooleanFFlag<"android-pad-segment">, Group<f_Group>;
} // let Flags = [TargetSpecific]
def shared_libflangrt : Flag<["-"], "shared-libflangrt">,
- HelpText<"Dynamically link the shared flang-rt">, Group<Link_Group>,
+ HelpText<"Link the flang-rt shared library">, Group<Link_Group>,
Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
def static_libflangrt : Flag<["-"], "static-libflangrt">,
- HelpText<"Statically link the static flang-rt">, Group<Link_Group>,
+ HelpText<"Link the flang-rt static library">, Group<Link_Group>,
Visibility<[FlangOption]>, Flags<[NoArgumentUnused]>;
//===----------------------------------------------------------------------===//
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index d4dcbb8e077ce..cc07cc7a19eb4 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -744,10 +744,12 @@ std::string ToolChain::buildCompilerRTBasename(const
llvm::opt::ArgList &Args,
Suffix = IsITANMSVCWindows ? ".lib" : ".a";
break;
case ToolChain::FT_Shared:
- Suffix = TT.isOSWindows()
- ? (TT.isWindowsGNUEnvironment() ? ".dll.a" : ".lib")
- : TT.isOSAIX() ? ".a"
- : ".so";
+ if (TT.isOSWindows())
+ Suffix = TT.isWindowsGNUEnvironment() ? ".dll.a" : ".lib";
+ else if (TT.isOSAIX())
+ Suffix = ".a";
+ else
+ Suffix = ".so";
break;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
