https://github.com/DominikAdamski updated
https://github.com/llvm/llvm-project/pull/88280
>From 1330d076904d98a0a594700cca1c3e4a6b15dd58 Mon Sep 17 00:00:00 2001
From: Dominik Adamski <dominik.adam...@amd.com>
Date: Wed, 10 Apr 2024 09:42:09 -0500
Subject: [PATCH 1/2] [Flang] Add option frtlib-add-rpath
This option is used by clang and should also be visible in flang.
It is already handled by the toolchains used by both clang and flang.
---
clang/include/clang/Driver/Options.td | 2 ++
flang/test/Driver/driver-help-hidden.f90 | 2 ++
flang/test/Driver/driver-help.f90 | 2 ++
3 files changed, 6 insertions(+)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index f745e573eb2686..d26c48b3585de7 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -5472,10 +5472,12 @@ def rpath : Separate<["-"], "rpath">,
Flags<[LinkerInput]>, Group<Link_Group>,
def rtlib_EQ : Joined<["-", "--"], "rtlib=">, Visibility<[ClangOption,
CLOption]>,
HelpText<"Compiler runtime library to use">;
def frtlib_add_rpath: Flag<["-"], "frtlib-add-rpath">,
Flags<[NoArgumentUnused]>,
+ Visibility<[ClangOption, FlangOption]>,
HelpText<"Add -rpath with architecture-specific resource directory to the
linker flags. "
"When --hip-link is specified, also add -rpath with HIP runtime library
directory to the linker flags">;
def fno_rtlib_add_rpath: Flag<["-"], "fno-rtlib-add-rpath">,
Flags<[NoArgumentUnused]>,
+ Visibility<[ClangOption, FlangOption]>,
HelpText<"Do not add -rpath with architecture-specific resource directory to
the linker flags. "
"When --hip-link is specified, do not add -rpath with HIP runtime library
directory to the linker flags">;
def offload_add_rpath: Flag<["--"], "offload-add-rpath">,
diff --git a/flang/test/Driver/driver-help-hidden.f90
b/flang/test/Driver/driver-help-hidden.f90
index 48f48f5384fdc5..46f6fb76fe41a8 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -67,6 +67,7 @@
! CHECK-NEXT: -fno-lto Disable LTO mode (default)
! CHECK-NEXT: -fno-ppc-native-vector-element-order
! CHECK-NEXT: Specifies PowerPC non-native vector
element order
+! CHECK-NEXT: -fno-rtlib-add-rpath Do not add -rpath with
architecture-specific resource directory to the linker flags. When --hip-link
is specified, do not add -rpath with HIP runtime library directory to the
linker flags
! CHECK-NEXT: -fno-signed-zeros Allow optimizations that ignore the sign
of floating point zeros
! CHECK-NEXT: -fno-stack-arrays Allocate array temporaries on the heap
(default)
! CHECK-NEXT: -fno-version-loops-for-stride
@@ -92,6 +93,7 @@
! CHECK-NEXT: Specifies PowerPC native vector element
order (default)
! CHECK-NEXT: -freciprocal-math Allow division operations to be
reassociated
! CHECK-NEXT: -fropi Generate read-only position independent
code (ARM only)
+! CHECK-NEXT: -frtlib-add-rpath Add -rpath with architecture-specific resource
directory to the linker flags. When --hip-link is specified, also add -rpath
with HIP runtime library directory to the linker flags
! CHECK-NEXT: -frwpi Generate read-write position independent
code (ARM only)
! CHECK-NEXT: -fsave-optimization-record=<format>
! CHECK-NEXT: Generate an optimization record file in
a specific format
diff --git a/flang/test/Driver/driver-help.f90
b/flang/test/Driver/driver-help.f90
index 38f74395a678ab..f0d42090835590 100644
--- a/flang/test/Driver/driver-help.f90
+++ b/flang/test/Driver/driver-help.f90
@@ -59,6 +59,7 @@
! HELP-NEXT: -fno-lto Disable LTO mode (default)
! HELP-NEXT: -fno-ppc-native-vector-element-order
! HELP-NEXT: Specifies PowerPC non-native vector
element order
+! HELP-NEXT: -fno-rtlib-add-rpath Do not add -rpath with
architecture-specific resource directory to the linker flags. When --hip-link
is specified, do not add -rpath with HIP runtime library directory to the
linker flags
! HELP-NEXT: -fno-signed-zeros Allow optimizations that ignore the sign
of floating point zeros
! HELP-NEXT: -fno-stack-arrays Allocate array temporaries on the heap
(default)
! HELP-NEXT: -fno-version-loops-for-stride
@@ -80,6 +81,7 @@
! HELP-NEXT: Specifies PowerPC native vector element
order (default)
! HELP-NEXT: -freciprocal-math Allow division operations to be
reassociated
! HELP-NEXT: -fropi Generate read-only position independent
code (ARM only)
+! HELP-NEXT: -frtlib-add-rpath Add -rpath with architecture-specific resource
directory to the linker flags. When --hip-link is specified, also add -rpath
with HIP runtime library directory to the linker flags
! HELP-NEXT: -frwpi Generate read-write position independent
code (ARM only)
! HELP-NEXT: -fsave-optimization-record=<format>
! HELP-NEXT: Generate an optimization record file in a
specific format
>From 04baae58f97499cd3700258376b9da568e417abb Mon Sep 17 00:00:00 2001
From: Dominik Adamski <dominik.adam...@amd.com>
Date: Thu, 11 Apr 2024 05:23:55 -0500
Subject: [PATCH 2/2] Add test
---
clang/include/clang/Driver/Options.td | 4 +--
clang/lib/Driver/ToolChains/Flang.cpp | 4 +++
.../Driver/arch-specific-libdir-rpath.f95 | 32 +++++++++++++++++++
flang/test/Driver/driver-help-hidden.f90 | 1 +
4 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 flang/test/Driver/arch-specific-libdir-rpath.f95
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index d26c48b3585de7..e4adf3ffdc3849 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -5461,11 +5461,11 @@ def rdynamic : Flag<["-"], "rdynamic">,
Group<Link_Group>,
Visibility<[ClangOption, FlangOption]>;
def resource_dir : Separate<["-"], "resource-dir">,
Flags<[NoXarchOption, HelpHidden]>,
- Visibility<[ClangOption, CC1Option, CLOption, DXCOption]>,
+ Visibility<[ClangOption, CC1Option, CLOption, DXCOption, FlangOption,
FC1Option]>,
HelpText<"The directory which holds the compiler resource files">,
MarshallingInfoString<HeaderSearchOpts<"ResourceDir">>;
def resource_dir_EQ : Joined<["-"], "resource-dir=">, Flags<[NoXarchOption]>,
- Visibility<[ClangOption, CLOption, DXCOption]>,
+ Visibility<[ClangOption, CLOption, DXCOption, FlangOption]>,
Alias<resource_dir>;
def rpath : Separate<["-"], "rpath">, Flags<[LinkerInput]>, Group<Link_Group>,
Visibility<[ClangOption, CLOption, DXCOption, FlangOption]>;
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp
b/clang/lib/Driver/ToolChains/Flang.cpp
index 2c83f70eb7887e..b90d0a9440e011 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -783,6 +783,10 @@ void Flang::ConstructJob(Compilation &C, const JobAction
&JA,
}
}
+ // Pass the path to compiler resource files.
+ CmdArgs.push_back("-resource-dir");
+ CmdArgs.push_back(D.ResourceDir.c_str());
+
// Offloading related options
addOffloadOptions(C, Inputs, JA, Args, CmdArgs);
diff --git a/flang/test/Driver/arch-specific-libdir-rpath.f95
b/flang/test/Driver/arch-specific-libdir-rpath.f95
new file mode 100644
index 00000000000000..dc8ab7d08c29e8
--- /dev/null
+++ b/flang/test/Driver/arch-specific-libdir-rpath.f95
@@ -0,0 +1,32 @@
+// REQUIRES: x86-registered-target
+// Test that the driver adds an arch-specific subdirectory in
+// {RESOURCE_DIR}/lib/linux to the linker search path and to '-rpath'
+//
+// Test the default behavior when neither -frtlib-add-rpath nor
+// -fno-rtlib-add-rpath is specified, which is to skip -rpath
+// RUN: %flang %s -### --target=x86_64-linux \
+// RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_arch_subdir
2>&1 \
+// RUN: | FileCheck --check-prefixes=RESDIR,LIBPATH-X86_64,NO-RPATH-X86_64 %s
+//
+// Test that -rpath is not added under -fno-rtlib-add-rpath
+// RUN: %flang %s -### --target=x86_64-linux \
+// RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_arch_subdir
\
+// RUN: -fno-rtlib-add-rpath 2>&1 \
+// RUN: | FileCheck --check-prefixes=RESDIR,LIBPATH-X86_64,NO-RPATH-X86_64 %s
+//
+// Test that -rpath is added
+//
+// Add LIBPATH, RPATH for OpenMP
+//
+// RUN: %flang %s -### --target=x86_64-linux -fopenmp \
+// RUN:
-resource-dir=%S/../../../clang/test/Driver/Inputs/resource_dir_with_arch_subdir
\
+// RUN: -frtlib-add-rpath 2>&1 \
+// RUN: | FileCheck --check-prefixes=RESDIR,LIBPATH-X86_64,RPATH-X86_64 %s
+//
+
+// RESDIR: "-resource-dir" "[[RESDIR:[^"]*]]"
+//
+// LIBPATH-X86_64: -L[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}
+// RPATH-X86_64: "-rpath"
"[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}"
+//
+// NO-RPATH-X86_64-NOT: "-rpath"
"[[RESDIR]]{{(/|\\\\)lib(/|\\\\)linux(/|\\\\)x86_64}}"
diff --git a/flang/test/Driver/driver-help-hidden.f90
b/flang/test/Driver/driver-help-hidden.f90
index 46f6fb76fe41a8..89ccb9a2bb26c9 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -146,6 +146,7 @@
! CHECK-NEXT: -print-target-triple Print the normalized target triple
! CHECK-NEXT: -pthread Support POSIX threads in generated code
! CHECK-NEXT: -P Disable linemarker output in -E mode
+! CHECK-NEXT: -resource-dir <value> The directory which holds the compiler
resource files
! CHECK-NEXT: -Rpass-analysis=<value> Report transformation analysis from
optimization passes whose name matches the given POSIX regular expression
! CHECK-NEXT: -Rpass-missed=<value> Report missed transformations by
optimization passes whose name matches the given POSIX regular expression
! CHECK-NEXT: -Rpass=<value> Report transformations performed by
optimization passes whose name matches the given POSIX regular expression
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
