Skip to content

Commit dd38c3f

Browse files
committed
Avoid mentions of Clang in Flang's command line reference.
The help text was not updated in llvm#87360. Clang is also mentioned for the diagnositic warnings reference, which mostly applies to C/C++/Obj-C, not Fortran. llvm#81726 already tried to fix this, and I don't know a better solution.
1 parent 8cee94e commit dd38c3f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,12 @@ def gcc_install_dir_EQ : Joined<["--"], "gcc-install-dir=">,
807807
"Note: executables (e.g. ld) used by the compiler are not overridden by the selected GCC installation">;
808808
def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[NoXarchOption]>,
809809
Visibility<[ClangOption, FlangOption]>,
810-
HelpText<"Specify a directory where Clang can find 'include' and 'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
811-
"Clang will use the GCC installation with the largest version">;
810+
HelpText<
811+
"Specify a directory where Clang can find 'include' and 'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
812+
"Clang will use the GCC installation with the largest version">,
813+
HelpTextForVariants<[FlangOption],
814+
"Specify a directory where Flang can find 'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
815+
"Flang will use the GCC installation with the largest version">;
812816
def gcc_triple_EQ : Joined<["--"], "gcc-triple=">,
813817
HelpText<"Search for the GCC installation with the specified triple.">;
814818
def CC : Flag<["-"], "CC">, Visibility<[ClangOption, CC1Option]>,

flang/test/Driver/driver-help-hidden.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
! CHECK-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV.
110110
! CHECK-NEXT: --gcc-install-dir=<value>
111111
! 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
112-
! 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
112+
! 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
113113
! CHECK-NEXT: -gline-directives-only Emit debug line info directives only
114114
! CHECK-NEXT: -gline-tables-only Emit debug line number tables only
115115
! CHECK-NEXT: -gpulibc Link the LLVM C Library for GPUs

flang/test/Driver/driver-help.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
! HELP-NEXT: -fxor-operator Enable .XOR. as a synonym of .NEQV.
9898
! HELP-NEXT: --gcc-install-dir=<value>
9999
! 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
100-
! 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
100+
! 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
101101
! HELP-NEXT: -gline-directives-only Emit debug line info directives only
102102
! HELP-NEXT: -gline-tables-only Emit debug line number tables only
103103
! HELP-NEXT: -gpulibc Link the LLVM C Library for GPUs

0 commit comments

Comments
 (0)