https://github.com/Meinersbur created
https://github.com/llvm/llvm-project/pull/88932
The help text was not updated in #87360.
Clang is also mentioned for the diagnostic warnings reference, which mostly
applies to C/C++/Obj-C, not Fortran. #81726 already tried to fix this, and I
don't know a better solution.
>From dd38c3f9aa30652242dfb5cf2e9bd53e8ff0e286 Mon Sep 17 00:00:00 2001
From: Michael Kruse <llvm-proj...@meinersbur.de>
Date: Tue, 16 Apr 2024 15:20:29 +0200
Subject: [PATCH] Avoid mentions of Clang in Flang's command line reference.
The help text was not updated in #87360.
Clang is also mentioned for the diagnositic warnings reference, which
mostly applies to C/C++/Obj-C, not Fortran. #81726 already tried to fix
this, and I don't know a better solution.
---
clang/include/clang/Driver/Options.td | 8 ++++++--
flang/test/Driver/driver-help-hidden.f90 | 2 +-
flang/test/Driver/driver-help.f90 | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index e24626913add76..d89b53e4049cf6 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -807,8 +807,12 @@ def gcc_install_dir_EQ : Joined<["--"],
"gcc-install-dir=">,
"Note: executables (e.g. ld) used by the compiler are not overridden by the
selected GCC installation">;
def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[NoXarchOption]>,
Visibility<[ClangOption, FlangOption]>,
- HelpText<"Specify a directory where Clang can find 'include' and
'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
- "Clang will use the GCC installation with the largest version">;
+ HelpText<
+ "Specify a directory where Clang can find 'include' and
'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
+ "Clang will use the GCC installation with the largest version">,
+ HelpTextForVariants<[FlangOption],
+ "Specify a directory where Flang can find
'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
+ "Flang will use the GCC installation with the largest version">;
def gcc_triple_EQ : Joined<["--"], "gcc-triple=">,
HelpText<"Search for the GCC installation with the specified triple.">;
def CC : Flag<["-"], "CC">, Visibility<[ClangOption, CC1Option]>,
diff --git a/flang/test/Driver/driver-help-hidden.f90
b/flang/test/Driver/driver-help-hidden.f90
index de2fe3048f993c..b5bb0f1c1b2560 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -109,7 +109,7 @@
! CHECK-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV.
! CHECK-NEXT: --gcc-install-dir=<value>
! CHECK-NEXT: Use GCC installation in the specified
directory. The directory ends with path components like
'lib{,32,64}/gcc{,-cross}/$triple/$version'. Note: executables (e.g. ld) used
by the compiler are not overridden by the selected GCC installation
-! CHECK-NEXT: --gcc-toolchain=<value> Specify a directory where Clang can find
'include' and 'lib{,32,64}/gcc{,-cross}/$triple/$version'. Clang will use the
GCC installation with the largest version
+! CHECK-NEXT: --gcc-toolchain=<value> Specify a directory where Flang can find
'lib{,32,64}/gcc{,-cross}/$triple/$version'. Flang will use the GCC
installation with the largest version
! CHECK-NEXT: -gline-directives-only Emit debug line info directives only
! CHECK-NEXT: -gline-tables-only Emit debug line number tables only
! CHECK-NEXT: -gpulibc Link the LLVM C Library for GPUs
diff --git a/flang/test/Driver/driver-help.f90
b/flang/test/Driver/driver-help.f90
index b258eb59c18629..0b0a493baf07f7 100644
--- a/flang/test/Driver/driver-help.f90
+++ b/flang/test/Driver/driver-help.f90
@@ -97,7 +97,7 @@
! HELP-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV.
! HELP-NEXT: --gcc-install-dir=<value>
! HELP-NEXT: Use GCC installation in the specified
directory. The directory ends with path components like
'lib{,32,64}/gcc{,-cross}/$triple/$version'. Note: executables (e.g. ld) used
by the compiler are not overridden by the selected GCC installation
-! HELP-NEXT: --gcc-toolchain=<value> Specify a directory where Clang can find
'include' and 'lib{,32,64}/gcc{,-cross}/$triple/$version'. Clang will use the
GCC installation with the largest version
+! HELP-NEXT: --gcc-toolchain=<value> Specify a directory where Flang can find
'lib{,32,64}/gcc{,-cross}/$triple/$version'. Flang will use the GCC
installation with the largest version
! HELP-NEXT: -gline-directives-only Emit debug line info directives only
! HELP-NEXT: -gline-tables-only Emit debug line number tables only
! HELP-NEXT: -gpulibc Link the LLVM C Library for GPUs
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
