Author: Joseph Huber Date: 2022-07-08T11:50:56-04:00 New Revision: 0d7161af89f91db798f7be2a521568a4cd754214
URL: https://github.com/llvm/llvm-project/commit/0d7161af89f91db798f7be2a521568a4cd754214 DIFF: https://github.com/llvm/llvm-project/commit/0d7161af89f91db798f7be2a521568a4cd754214.diff LOG: [Clang] Fix test failing due to renamed arg Added: Modified: clang/test/Driver/amdgpu-openmp-toolchain-new.c clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td Removed: ################################################################################ diff --git a/clang/test/Driver/amdgpu-openmp-toolchain-new.c b/clang/test/Driver/amdgpu-openmp-toolchain-new.c index 2ddc5a12c200..1551917ea50f 100644 --- a/clang/test/Driver/amdgpu-openmp-toolchain-new.c +++ b/clang/test/Driver/amdgpu-openmp-toolchain-new.c @@ -50,4 +50,4 @@ // CHECK-EMIT-LLVM-IR: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}}"-emit-llvm" // RUN: %clang -### -target x86_64-pc-linux-gnu -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=gfx803 -lm --rocm-device-lib-path=%S/Inputs/rocm/amdgcn/bitcode -fopenmp-new-driver %s 2>&1 | FileCheck %s --check-prefix=CHECK-LIB-DEVICE-NEW -// CHECK-LIB-DEVICE-NEW: {{.*}}clang-linker-wrapper{{.*}}-target-library=openmp-amdgcn-amd-amdhsa-gfx803={{.*}}ocml.bc"{{.*}}ockl.bc"{{.*}}oclc_daz_opt_on.bc"{{.*}}oclc_unsafe_math_off.bc"{{.*}}oclc_finite_only_off.bc"{{.*}}oclc_correctly_rounded_sqrt_on.bc"{{.*}}oclc_wavefrontsize64_on.bc"{{.*}}oclc_isa_version_803.bc" +// CHECK-LIB-DEVICE-NEW: {{.*}}clang-linker-wrapper{{.*}}--bitcode-library=openmp-amdgcn-amd-amdhsa-gfx803={{.*}}ocml.bc"{{.*}}ockl.bc"{{.*}}oclc_daz_opt_on.bc"{{.*}}oclc_unsafe_math_off.bc"{{.*}}oclc_finite_only_off.bc"{{.*}}oclc_correctly_rounded_sqrt_on.bc"{{.*}}oclc_wavefrontsize64_on.bc"{{.*}}oclc_isa_version_803.bc" diff --git a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td index 0b0b2c901361..7620873aa8f6 100644 --- a/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td +++ b/clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td @@ -75,27 +75,33 @@ def sysroot_EQ : Joined<["--"], "sysroot">, HelpText<"Set the system root">; def o : JoinedOrSeparate<["-"], "o">, MetaVarName<"<path>">, HelpText<"Path to file to write output">; -def output_EQ : Joined<["--"], "output=">, Alias<o>, HelpText<"Alias for -o">; -def output : Separate<["--"], "output">, Alias<o>, HelpText<"Alias for -o">; +def output_EQ : Joined<["--"], "output=">, Alias<o>, Flags<[HelpHidden]>, + HelpText<"Alias for -o">; +def output : Separate<["--"], "output">, Alias<o>, Flags<[HelpHidden]>, + HelpText<"Alias for -o">; def library_path : JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">, HelpText<"Add <dir> to the library search path">; -def library_path_S : Separate<["--", "-"], "library-path">, Alias<library_path>; -def library_path_EQ : Joined<["--", "-"], "library-path=">, Alias<library_path>; +def library_path_S : Separate<["--", "-"], "library-path">, Flags<[HelpHidden]>, + Alias<library_path>; +def library_path_EQ : Joined<["--", "-"], "library-path=">, Flags<[HelpHidden]>, + Alias<library_path>; def library : JoinedOrSeparate<["-"], "l">, MetaVarName<"<libname>">, HelpText<"Search for library <libname>">; -def library_S : Separate<["--", "-"], "library">, Alias<library_path>; -def library_EQ : Joined<["--", "-"], "library=">, Alias<library_path>; +def library_S : Separate<["--", "-"], "library">, Flags<[HelpHidden]>, + Alias<library_path>; +def library_EQ : Joined<["--", "-"], "library=">, Flags<[HelpHidden]>, + Alias<library_path>; def as_needed : Flag<["--", "-"], "as-needed">; def no_as_needed : Flag<["--", "-"], "no-as-needed">; def rpath : Separate<["--", "-"], "rpath">; -def rpath_EQ : Joined<["--", "-"], "rpath=">, Alias<rpath>; +def rpath_EQ : Joined<["--", "-"], "rpath=">, Flags<[HelpHidden]>, Alias<rpath>; def dynamic_linker : Separate<["--", "-"], "dynamic-linker">; def dynamic_linker_EQ : Joined<["--", "-"], "dynamic-linker=">, Alias<dynamic_linker>; def v : Flag<["--", "-"], "v">, HelpText<"Display the version number and exit">; -def version : Flag<["--", "-"], "version">, Alias<v>; +def version : Flag<["--", "-"], "version">, Flags<[HelpHidden]>, Alias<v>; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
