diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -912,7 +912,8 @@ HelpText<"Enable warnings for deprecated constructs and define __DEPRECATED">; def Wno_deprecated : Flag<["-"], "Wno-deprecated">, Group, Visibility<[ClangOption, CC1Option]>; -def Wl_COMMA : CommaJoined<["-"], "Wl,">, Flags<[LinkerInput, RenderAsInput]>, +def Wl_COMMA : CommaJoined<["-"], "Wl,">, Visibility<[ClangOption, FlangOption]>, + Flags<[LinkerInput, RenderAsInput]>, HelpText<"Pass the comma separated arguments in to the linker">, MetaVarName<"">, Group; // FIXME: This is broken; these should not be Joined arguments. diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90 --- a/flang/test/Driver/driver-help-hidden.f90 +++ b/flang/test/Driver/driver-help-hidden.f90 @@ -132,6 +132,7 @@ ! CHECK-NEXT: -U Undefine macro ! CHECK-NEXT: --version Print version information ! CHECK-NEXT: -v Show commands to run and use verbose output +! CHECK-NEXT: -Wl, Pass the comma separated arguments in to the linker ! CHECK-NEXT: -W Enable the specified warning ! CHECK-NEXT: -Xflang Pass to the flang compiler ! CHECK-NEXT: -x Treat subsequent input files as having type diff --git a/flang/test/Driver/driver-help.f90 b/flang/test/Driver/driver-help.f90 --- a/flang/test/Driver/driver-help.f90 +++ b/flang/test/Driver/driver-help.f90 @@ -120,6 +120,7 @@ ! HELP-NEXT: -U Undefine macro ! HELP-NEXT: --version Print version information ! HELP-NEXT: -v Show commands to run and use verbose output +! HELP-NEXT: -Wl, Pass the comma separated arguments in to the linker ! HELP-NEXT: -W Enable the specified warning ! HELP-NEXT: -Xflang Pass to the flang compiler ! HELP-NEXT: -x Treat subsequent input files as having type diff --git a/flang/test/Driver/misc-flags.f90 b/flang/test/Driver/misc-flags.f90 --- a/flang/test/Driver/misc-flags.f90 +++ b/flang/test/Driver/misc-flags.f90 @@ -1,6 +1,9 @@ ! Make sure that `-l` is "visible" to Flang's driver ! RUN: %flang -lpgmath -### %s +! Make sure that `-Wl` is "visible" to Flang's driver +! RUN: %flang -Wl,abs -### %s + program hello write(*,*), "Hello world!" end program hello