Author: Amy Huang Date: 2022-09-22T23:08:52Z New Revision: 3283f71069a0d91593c81a610a710979fb655d7f
URL: https://github.com/llvm/llvm-project/commit/3283f71069a0d91593c81a610a710979fb655d7f DIFF: https://github.com/llvm/llvm-project/commit/3283f71069a0d91593c81a610a710979fb655d7f.diff LOG: Add clang flag equivalent to clang-cl /Zl flag The /Zl flag omits default C runtime library name from obj files. This patch just adds an equivalent clang driver flag. Differential Revision: https://reviews.llvm.org/D133959 Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/Clang.cpp clang/test/Driver/cl-runtime-flags.c Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 65028569862e..d32e149b36a3 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2227,6 +2227,8 @@ Specify Visual Studio C runtime library. "static" and "static_dbg" correspond to the cl flags /MT and /MTd which use the multithread, static version. "dll" and "dll_dbg" correspond to the cl flags /MD and /MDd which use the multithread, dll version.}]>; +def fms_omit_default_lib : Joined<["-"], "fms-omit-default-lib">, + Group<f_Group>, Flags<[NoXarchOption, CoreOption]>; defm delayed_template_parsing : BoolFOption<"delayed-template-parsing", LangOpts<"DelayedTemplateParsing">, DefaultFalse, PosFlag<SetTrue, [CC1Option], "Parse templated function definitions at the end of the translation unit">, @@ -6784,7 +6786,7 @@ def _SLASH_volatile_ms : Option<["/", "-"], "volatile:ms", KIND_FLAG>, HelpText<"Volatile loads and stores have acquire and release semantics">; def _SLASH_clang : CLJoined<"clang:">, HelpText<"Pass <arg> to the clang driver">, MetaVarName<"<arg>">; -def _SLASH_Zl : CLFlag<"Zl">, +def _SLASH_Zl : CLFlag<"Zl">, Alias<fms_omit_default_lib>, HelpText<"Do not let object file auto-link default libraries">; def _SLASH_Yc : CLJoined<"Yc">, diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 02683f1365f6..5de55dd791d3 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4499,7 +4499,7 @@ static void ProcessVSRuntimeLibrary(const ArgList &Args, llvm_unreachable("Unexpected option ID."); } - if (Args.hasArg(options::OPT__SLASH_Zl)) { + if (Args.hasArg(options::OPT_fms_omit_default_lib)) { CmdArgs.push_back("-D_VC_NODEFAULTLIB"); } else { CmdArgs.push_back(FlagForCRT.data()); diff --git a/clang/test/Driver/cl-runtime-flags.c b/clang/test/Driver/cl-runtime-flags.c index 78e19f7799c9..2a6151e08c04 100644 --- a/clang/test/Driver/cl-runtime-flags.c +++ b/clang/test/Driver/cl-runtime-flags.c @@ -97,6 +97,9 @@ // RUN: %clang_cl -### /Zl -- %s 2>&1 | FileCheck -check-prefix=CHECK-MTZl %s // RUN: %clang_cl -### /MT /Zl -- %s 2>&1 | FileCheck -check-prefix=CHECK-MTZl %s +// RUN: %clang -### --target=x86_64-windows-msvc -fms-runtime-lib=static \ +// RUN: -fms-omit-default-lib -- %s 2>&1 | FileCheck \ +// RUN: -check-prefix=CHECK-MTZl %s // CHECK-MTZl-NOT: "-D_DEBUG" // CHECK-MTZl: "-D_MT" // CHECK-MTZl-NOT: "-D_DLL" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
