aboutsummaryrefslogtreecommitdiff
path: root/clang/lib
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/MultilibBuilder.cpp2
-rw-r--r--clang/lib/Driver/ToolChain.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/AIX.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/AMDGPU.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/AVR.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Arch/AArch64.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Arch/LoongArch.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Arch/Mips.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Arch/PPC.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Arch/RISCV.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/BareMetal.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/CSKYToolChain.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Clang.cpp28
-rw-r--r--clang/lib/Driver/ToolChains/CommonArgs.cpp24
-rw-r--r--clang/lib/Driver/ToolChains/CommonArgs.h280
-rw-r--r--clang/lib/Driver/ToolChains/CrossWindows.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Cuda.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Cygwin.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Darwin.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/DragonFly.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Flang.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/FreeBSD.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Fuchsia.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Gnu.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/HIPAMD.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/HIPSPV.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/HIPUtility.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/HLSL.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Haiku.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Hexagon.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Hurd.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/InterfaceStubs.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Linux.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/MSP430.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/MSVC.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/MinGW.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/NaCl.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/NetBSD.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/OHOS.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/OpenBSD.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/PS4CPU.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/RISCVToolchain.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/SPIRV.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/SYCL.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/Solaris.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/UEFI.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/VEToolchain.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/WebAssembly.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/XCore.cpp2
-rw-r--r--clang/lib/Driver/ToolChains/ZOS.cpp2
-rw-r--r--clang/lib/Driver/XRayArgs.cpp2
52 files changed, 77 insertions, 353 deletions
diff --git a/clang/lib/Driver/MultilibBuilder.cpp b/clang/lib/Driver/MultilibBuilder.cpp
index 8440a82..9d44d86 100644
--- a/clang/lib/Driver/MultilibBuilder.cpp
+++ b/clang/lib/Driver/MultilibBuilder.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "clang/Driver/MultilibBuilder.h"
-#include "ToolChains/CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Regex.h"
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index f291171..571ac53 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -11,13 +11,13 @@
#include "ToolChains/Arch/ARM.h"
#include "ToolChains/Arch/RISCV.h"
#include "ToolChains/Clang.h"
-#include "ToolChains/CommonArgs.h"
#include "ToolChains/Flang.h"
#include "ToolChains/InterfaceStubs.h"
#include "clang/Basic/ObjCRuntime.h"
#include "clang/Basic/Sanitizers.h"
#include "clang/Config/config.h"
#include "clang/Driver/Action.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Job.h"
diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp
index a1a94e3..066b593 100644
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "AIX.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/SanitizerArgs.h"
diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
index dfbe936..cf9c24f 100644
--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "AMDGPU.h"
-#include "CommonArgs.h"
#include "clang/Basic/TargetID.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/AVR.cpp b/clang/lib/Driver/ToolChains/AVR.cpp
index f1529f8..b0523a7 100644
--- a/clang/lib/Driver/ToolChains/AVR.cpp
+++ b/clang/lib/Driver/ToolChains/AVR.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "AVR.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
index eaae9f8..ea906d2 100644
--- a/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/AArch64.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "AArch64.h"
-#include "../CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/Option/ArgList.h"
diff --git a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
index a35f8276..3318e49 100644
--- a/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/LoongArch.cpp
@@ -8,8 +8,8 @@
#include "LoongArch.h"
#include "../Clang.h"
-#include "ToolChains/CommonArgs.h"
#include "clang/Basic/DiagnosticDriver.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/TargetParser/Host.h"
diff --git a/clang/lib/Driver/ToolChains/Arch/Mips.cpp b/clang/lib/Driver/ToolChains/Arch/Mips.cpp
index 0d84758..8787c82 100644
--- a/clang/lib/Driver/ToolChains/Arch/Mips.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/Mips.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "Mips.h"
-#include "ToolChains/CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/ADT/StringSwitch.h"
diff --git a/clang/lib/Driver/ToolChains/Arch/PPC.cpp b/clang/lib/Driver/ToolChains/Arch/PPC.cpp
index afa8623..361a68a 100644
--- a/clang/lib/Driver/ToolChains/Arch/PPC.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/PPC.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "PPC.h"
-#include "ToolChains/CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/ADT/StringSwitch.h"
diff --git a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
index d0b6209..baa2c8c 100644
--- a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
@@ -8,7 +8,7 @@
#include "RISCV.h"
#include "../Clang.h"
-#include "ToolChains/CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/Option/ArgList.h"
diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp
index 6bf2302..d8168ed 100644
--- a/clang/lib/Driver/ToolChains/BareMetal.cpp
+++ b/clang/lib/Driver/ToolChains/BareMetal.cpp
@@ -8,8 +8,8 @@
#include "BareMetal.h"
-#include "CommonArgs.h"
#include "Gnu.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/InputInfo.h"
#include "Arch/ARM.h"
diff --git a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp b/clang/lib/Driver/ToolChains/CSKYToolChain.cpp
index e944cba..e4db330 100644
--- a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp
+++ b/clang/lib/Driver/ToolChains/CSKYToolChain.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "CSKYToolChain.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 80dd72a..65f101d 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -14,7 +14,6 @@
#include "Arch/RISCV.h"
#include "Arch/Sparc.h"
#include "Arch/SystemZ.h"
-#include "CommonArgs.h"
#include "Hexagon.h"
#include "PS4CPU.h"
#include "clang/Basic/CLWarnings.h"
@@ -26,6 +25,7 @@
#include "clang/Basic/Version.h"
#include "clang/Config/config.h"
#include "clang/Driver/Action.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Distro.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Options.h"
@@ -264,27 +264,6 @@ static void ParseMRecip(const Driver &D, const ArgList &Args,
OutStrings.push_back(Args.MakeArgString(Out));
}
-/// The -mprefer-vector-width option accepts either a positive integer
-/// or the string "none".
-static void ParseMPreferVectorWidth(const Driver &D, const ArgList &Args,
- ArgStringList &CmdArgs) {
- Arg *A = Args.getLastArg(options::OPT_mprefer_vector_width_EQ);
- if (!A)
- return;
-
- StringRef Value = A->getValue();
- if (Value == "none") {
- CmdArgs.push_back("-mprefer-vector-width=none");
- } else {
- unsigned Width;
- if (Value.getAsInteger(10, Width)) {
- D.Diag(diag::err_drv_invalid_value) << A->getOption().getName() << Value;
- return;
- }
- CmdArgs.push_back(Args.MakeArgString("-mprefer-vector-width=" + Value));
- }
-}
-
static bool
shouldUseExceptionTablesForObjCExceptions(const ObjCRuntime &runtime,
const llvm::Triple &Triple) {
@@ -7607,7 +7586,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
handleVectorizeLoopsArgs(Args, CmdArgs);
handleVectorizeSLPArgs(Args, CmdArgs);
- ParseMPreferVectorWidth(D, Args, CmdArgs);
+
+ StringRef VecWidth = ParseMPreferVectorWidthOption(D.getDiags(), Args);
+ if (!VecWidth.empty())
+ CmdArgs.push_back(Args.MakeArgString("-mprefer-vector-width=" + VecWidth));
Args.AddLastArg(CmdArgs, options::OPT_fshow_overloads_EQ);
Args.AddLastArg(CmdArgs,
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index 937ee09..02b6e23 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "Arch/AArch64.h"
#include "Arch/ARM.h"
#include "Arch/CSKY.h"
@@ -3167,3 +3167,25 @@ void tools::handleInterchangeLoopsArgs(const ArgList &Args,
options::OPT_fno_loop_interchange, EnableInterchange))
CmdArgs.push_back("-floop-interchange");
}
+
+// Parse -mprefer-vector-width=. Return the Value string if well-formed.
+// Otherwise, return an empty string and issue a diagnosic message if needed.
+StringRef tools::ParseMPreferVectorWidthOption(clang::DiagnosticsEngine &Diags,
+ const llvm::opt::ArgList &Args) {
+ Arg *A = Args.getLastArg(clang::driver::options::OPT_mprefer_vector_width_EQ);
+ if (!A)
+ return "";
+
+ StringRef Value = A->getValue();
+ unsigned Width LLVM_ATTRIBUTE_UNINITIALIZED;
+
+ // Only "none" and Integer values are accepted by
+ // -mprefer-vector-width=<value>.
+ if (Value != "none" && Value.getAsInteger(10, Width)) {
+ Diags.Report(clang::diag::err_drv_invalid_value)
+ << A->getOption().getName() << Value;
+ return "";
+ }
+
+ return Value;
+}
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h
deleted file mode 100644
index b5b9c1e..0000000
--- a/clang/lib/Driver/ToolChains/CommonArgs.h
+++ /dev/null
@@ -1,280 +0,0 @@
-//===--- CommonArgs.h - Args handling for multiple toolchains ---*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_COMMONARGS_H
-#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_COMMONARGS_H
-
-#include "clang/Basic/CodeGenOptions.h"
-#include "clang/Driver/Driver.h"
-#include "clang/Driver/InputInfo.h"
-#include "clang/Driver/Multilib.h"
-#include "clang/Driver/Tool.h"
-#include "clang/Driver/ToolChain.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Option/Arg.h"
-#include "llvm/Option/ArgList.h"
-#include "llvm/Support/CodeGen.h"
-
-namespace clang {
-namespace driver {
-namespace tools {
-
-void addPathIfExists(const Driver &D, const Twine &Path,
- ToolChain::path_list &Paths);
-
-void AddLinkerInputs(const ToolChain &TC, const InputInfoList &Inputs,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, const JobAction &JA);
-
-void addLinkerCompressDebugSectionsOption(const ToolChain &TC,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void claimNoWarnArgs(const llvm::opt::ArgList &Args);
-
-bool addSanitizerRuntimes(const ToolChain &TC, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void linkSanitizerRuntimeDeps(const ToolChain &TC,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-bool addXRayRuntime(const ToolChain &TC, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void linkXRayRuntimeDeps(const ToolChain &TC, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void AddRunTimeLibs(const ToolChain &TC, const Driver &D,
- llvm::opt::ArgStringList &CmdArgs,
- const llvm::opt::ArgList &Args);
-
-void AddStaticDeviceLibsLinking(Compilation &C, const Tool &T,
- const JobAction &JA,
- const InputInfoList &Inputs,
- const llvm::opt::ArgList &DriverArgs,
- llvm::opt::ArgStringList &CmdArgs,
- StringRef Arch, StringRef Target,
- bool isBitCodeSDL);
-void AddStaticDeviceLibs(Compilation *C, const Tool *T, const JobAction *JA,
- const InputInfoList *Inputs, const Driver &D,
- const llvm::opt::ArgList &DriverArgs,
- llvm::opt::ArgStringList &CmdArgs, StringRef Arch,
- StringRef Target, bool isBitCodeSDL);
-
-const char *SplitDebugName(const JobAction &JA, const llvm::opt::ArgList &Args,
- const InputInfo &Input, const InputInfo &Output);
-
-void SplitDebugInfo(const ToolChain &TC, Compilation &C, const Tool &T,
- const JobAction &JA, const llvm::opt::ArgList &Args,
- const InputInfo &Output, const char *OutFile);
-
-void addLTOOptions(const ToolChain &ToolChain, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, const InputInfo &Output,
- const InputInfoList &Inputs, bool IsThinLTO);
-
-const char *RelocationModelName(llvm::Reloc::Model Model);
-
-std::tuple<llvm::Reloc::Model, unsigned, bool>
-ParsePICArgs(const ToolChain &ToolChain, const llvm::opt::ArgList &Args);
-
-unsigned ParseFunctionAlignment(const ToolChain &TC,
- const llvm::opt::ArgList &Args);
-
-void addDebugInfoKind(llvm::opt::ArgStringList &CmdArgs,
- llvm::codegenoptions::DebugInfoKind DebugInfoKind);
-
-llvm::codegenoptions::DebugInfoKind
-debugLevelToInfoKind(const llvm::opt::Arg &A);
-
-// Extract the integer N from a string spelled "-dwarf-N", returning 0
-// on mismatch. The StringRef input (rather than an Arg) allows
-// for use by the "-Xassembler" option parser.
-unsigned DwarfVersionNum(StringRef ArgValue);
-// Find a DWARF format version option.
-// This function is a complementary for DwarfVersionNum().
-const llvm::opt::Arg *getDwarfNArg(const llvm::opt::ArgList &Args);
-unsigned getDwarfVersion(const ToolChain &TC, const llvm::opt::ArgList &Args);
-
-void AddAssemblerKPIC(const ToolChain &ToolChain,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void addArchSpecificRPath(const ToolChain &TC, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-void addOpenMPRuntimeLibraryPath(const ToolChain &TC,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-/// Returns true, if an OpenMP runtime has been added.
-bool addOpenMPRuntime(const Compilation &C, llvm::opt::ArgStringList &CmdArgs,
- const ToolChain &TC, const llvm::opt::ArgList &Args,
- bool ForceStaticHostRuntime = false,
- bool IsOffloadingHost = false, bool GompNeedsRT = false);
-
-/// Adds offloading options for OpenMP host compilation to \p CmdArgs.
-void addOpenMPHostOffloadingArgs(const Compilation &C, const JobAction &JA,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void addHIPRuntimeLibArgs(const ToolChain &TC, Compilation &C,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-void addAsNeededOption(const ToolChain &TC, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, bool as_needed);
-
-llvm::opt::Arg *getLastCSProfileGenerateArg(const llvm::opt::ArgList &Args);
-llvm::opt::Arg *getLastProfileUseArg(const llvm::opt::ArgList &Args);
-llvm::opt::Arg *getLastProfileSampleUseArg(const llvm::opt::ArgList &Args);
-
-bool isObjCAutoRefCount(const llvm::opt::ArgList &Args);
-
-llvm::StringRef getLTOParallelism(const llvm::opt::ArgList &Args,
- const Driver &D);
-
-bool areOptimizationsEnabled(const llvm::opt::ArgList &Args);
-
-bool isUseSeparateSections(const llvm::Triple &Triple);
-// Parse -mtls-dialect=. Return true if the target supports both general-dynamic
-// and TLSDESC, and TLSDESC is requested.
-bool isTLSDESCEnabled(const ToolChain &TC, const llvm::opt::ArgList &Args);
-
-/// \p EnvVar is split by system delimiter for environment variables.
-/// If \p ArgName is "-I", "-L", or an empty string, each entry from \p EnvVar
-/// is prefixed by \p ArgName then added to \p Args. Otherwise, for each
-/// entry of \p EnvVar, \p ArgName is added to \p Args first, then the entry
-/// itself is added.
-void addDirectoryList(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, const char *ArgName,
- const char *EnvVar);
-
-void AddTargetFeature(const llvm::opt::ArgList &Args,
- std::vector<StringRef> &Features,
- llvm::opt::OptSpecifier OnOpt,
- llvm::opt::OptSpecifier OffOpt, StringRef FeatureName);
-
-std::string getCPUName(const Driver &D, const llvm::opt::ArgList &Args,
- const llvm::Triple &T, bool FromAs = false);
-
-void getTargetFeatures(const Driver &D, const llvm::Triple &Triple,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, bool ForAS,
- bool IsAux = false);
-
-/// Iterate \p Args and convert -mxxx to +xxx and -mno-xxx to -xxx and
-/// append it to \p Features.
-///
-/// Note: Since \p Features may contain default values before calling
-/// this function, or may be appended with entries to override arguments,
-/// entries in \p Features are not unique.
-void handleTargetFeaturesGroup(const Driver &D, const llvm::Triple &Triple,
- const llvm::opt::ArgList &Args,
- std::vector<StringRef> &Features,
- llvm::opt::OptSpecifier Group);
-
-/// If there are multiple +xxx or -xxx features, keep the last one.
-SmallVector<StringRef> unifyTargetFeatures(ArrayRef<StringRef> Features);
-
-/// Handles the -save-stats option and returns the filename to save statistics
-/// to.
-SmallString<128> getStatsFileName(const llvm::opt::ArgList &Args,
- const InputInfo &Output,
- const InputInfo &Input, const Driver &D);
-
-/// \p Flag must be a flag accepted by the driver.
-void addMultilibFlag(bool Enabled, const StringRef Flag,
- Multilib::flags_list &Flags);
-
-void addX86AlignBranchArgs(const Driver &D, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs, bool IsLTO,
- const StringRef PluginOptPrefix = "");
-
-void checkAMDGPUCodeObjectVersion(const Driver &D,
- const llvm::opt::ArgList &Args);
-
-unsigned getAMDGPUCodeObjectVersion(const Driver &D,
- const llvm::opt::ArgList &Args);
-
-bool haveAMDGPUCodeObjectVersionArgument(const Driver &D,
- const llvm::opt::ArgList &Args);
-
-void addMachineOutlinerArgs(const Driver &D, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs,
- const llvm::Triple &Triple, bool IsLTO,
- const StringRef PluginOptPrefix = "");
-
-void addOpenMPDeviceRTL(const Driver &D, const llvm::opt::ArgList &DriverArgs,
- llvm::opt::ArgStringList &CC1Args,
- StringRef BitcodeSuffix, const llvm::Triple &Triple,
- const ToolChain &HostTC);
-
-void addOutlineAtomicsArgs(const Driver &D, const ToolChain &TC,
- const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs,
- const llvm::Triple &Triple);
-void addOffloadCompressArgs(const llvm::opt::ArgList &TCArgs,
- llvm::opt::ArgStringList &CmdArgs);
-void addMCModel(const Driver &D, const llvm::opt::ArgList &Args,
- const llvm::Triple &Triple,
- const llvm::Reloc::Model &RelocationModel,
- llvm::opt::ArgStringList &CmdArgs);
-
-/// Handle the -f{no}-color-diagnostics and -f{no}-diagnostics-colors options.
-void handleColorDiagnosticsArgs(const Driver &D, const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-/// Add backslashes to escape spaces and other backslashes.
-/// This is used for the space-separated argument list specified with
-/// the -dwarf-debug-flags option.
-void escapeSpacesAndBackslashes(const char *Arg,
- llvm::SmallVectorImpl<char> &Res);
-
-/// Join the args in the given ArgList, escape spaces and backslashes and
-/// return the joined string. This is used when saving the command line as a
-/// result of using either the -frecord-command-line or -grecord-command-line
-/// options. The lifetime of the returned c-string will match that of the Args
-/// argument.
-const char *renderEscapedCommandLine(const ToolChain &TC,
- const llvm::opt::ArgList &Args);
-
-/// Check if the command line should be recorded in the object file. This is
-/// done if either -frecord-command-line or -grecord-command-line options have
-/// been passed. This also does some error checking since -frecord-command-line
-/// is currently only supported on ELF platforms. The last two boolean
-/// arguments are out parameters and will be set depending on the command
-/// line options that were passed.
-bool shouldRecordCommandLine(const ToolChain &TC,
- const llvm::opt::ArgList &Args,
- bool &FRecordCommandLine,
- bool &GRecordCommandLine);
-
-void renderCommonIntegerOverflowOptions(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-bool shouldEnableVectorizerAtOLevel(const llvm::opt::ArgList &Args,
- bool isSlpVec);
-
-/// Enable -floop-interchange based on the optimization level selected.
-void handleInterchangeLoopsArgs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-/// Enable -fvectorize based on the optimization level selected.
-void handleVectorizeLoopsArgs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-
-/// Enable -fslp-vectorize based on the optimization level selected.
-void handleVectorizeSLPArgs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs);
-} // end namespace tools
-} // end namespace driver
-} // end namespace clang
-
-clang::CodeGenOptions::FramePointerKind
-getFramePointerKind(const llvm::opt::ArgList &Args, const llvm::Triple &Triple);
-
-#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_COMMONARGS_H
diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp
index 3c5dfba..51c892f 100644
--- a/clang/lib/Driver/ToolChains/CrossWindows.cpp
+++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "CrossWindows.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp
index 073861d..a91e4de 100644
--- a/clang/lib/Driver/ToolChains/Cuda.cpp
+++ b/clang/lib/Driver/ToolChains/Cuda.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "Cuda.h"
-#include "CommonArgs.h"
#include "clang/Basic/Cuda.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Distro.h"
#include "clang/Driver/Driver.h"
diff --git a/clang/lib/Driver/ToolChains/Cygwin.cpp b/clang/lib/Driver/ToolChains/Cygwin.cpp
index f0e90de..d9c1634 100644
--- a/clang/lib/Driver/ToolChains/Cygwin.cpp
+++ b/clang/lib/Driver/ToolChains/Cygwin.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "Cygwin.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/Support/Path.h"
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 7073792..77d857b 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -8,10 +8,10 @@
#include "Darwin.h"
#include "Arch/ARM.h"
-#include "CommonArgs.h"
#include "clang/Basic/AlignedAllocation.h"
#include "clang/Basic/ObjCRuntime.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/DragonFly.cpp b/clang/lib/Driver/ToolChains/DragonFly.cpp
index 38a29ae..524f5f2 100644
--- a/clang/lib/Driver/ToolChains/DragonFly.cpp
+++ b/clang/lib/Driver/ToolChains/DragonFly.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "DragonFly.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
index dcc46469..e0a366b 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -8,9 +8,9 @@
#include "Flang.h"
#include "Arch/RISCV.h"
-#include "CommonArgs.h"
#include "clang/Basic/CodeGenOptions.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Options.h"
#include "llvm/Frontend/Debug/Options.h"
#include "llvm/Support/Path.h"
diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp
index ccf6987..b17b7623 100644
--- a/clang/lib/Driver/ToolChains/FreeBSD.cpp
+++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp
@@ -10,8 +10,8 @@
#include "Arch/ARM.h"
#include "Arch/Mips.h"
#include "Arch/Sparc.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/SanitizerArgs.h"
diff --git a/clang/lib/Driver/ToolChains/Fuchsia.cpp b/clang/lib/Driver/ToolChains/Fuchsia.cpp
index 910db1d..1c165bb 100644
--- a/clang/lib/Driver/ToolChains/Fuchsia.cpp
+++ b/clang/lib/Driver/ToolChains/Fuchsia.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "Fuchsia.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/MultilibBuilder.h"
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index e42cd0f..9c68c5c 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -15,8 +15,8 @@
#include "Arch/RISCV.h"
#include "Arch/Sparc.h"
#include "Arch/SystemZ.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/MultilibBuilder.h"
diff --git a/clang/lib/Driver/ToolChains/HIPAMD.cpp b/clang/lib/Driver/ToolChains/HIPAMD.cpp
index fc067e9..a8f2b09 100644
--- a/clang/lib/Driver/ToolChains/HIPAMD.cpp
+++ b/clang/lib/Driver/ToolChains/HIPAMD.cpp
@@ -8,10 +8,10 @@
#include "HIPAMD.h"
#include "AMDGPU.h"
-#include "CommonArgs.h"
#include "HIPUtility.h"
#include "SPIRV.h"
#include "clang/Basic/Cuda.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/HIPSPV.cpp b/clang/lib/Driver/ToolChains/HIPSPV.cpp
index 02ec36d..ec29c62 100644
--- a/clang/lib/Driver/ToolChains/HIPSPV.cpp
+++ b/clang/lib/Driver/ToolChains/HIPSPV.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "HIPSPV.h"
-#include "CommonArgs.h"
#include "HIPUtility.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/HIPUtility.cpp b/clang/lib/Driver/ToolChains/HIPUtility.cpp
index 8a3dd49..cb061ff 100644
--- a/clang/lib/Driver/ToolChains/HIPUtility.cpp
+++ b/clang/lib/Driver/ToolChains/HIPUtility.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "HIPUtility.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Options.h"
#include "llvm/ADT/StringExtras.h"
diff --git a/clang/lib/Driver/ToolChains/HLSL.cpp b/clang/lib/Driver/ToolChains/HLSL.cpp
index eb8f688..dcc51e1 100644
--- a/clang/lib/Driver/ToolChains/HLSL.cpp
+++ b/clang/lib/Driver/ToolChains/HLSL.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "HLSL.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Job.h"
#include "llvm/ADT/StringSwitch.h"
diff --git a/clang/lib/Driver/ToolChains/Haiku.cpp b/clang/lib/Driver/ToolChains/Haiku.cpp
index 5d0d8b7..dd6ada8 100644
--- a/clang/lib/Driver/ToolChains/Haiku.cpp
+++ b/clang/lib/Driver/ToolChains/Haiku.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "Haiku.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/SanitizerArgs.h"
#include "llvm/Support/Path.h"
diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp
index bed8de9..9f8b676 100644
--- a/clang/lib/Driver/ToolChains/Hexagon.cpp
+++ b/clang/lib/Driver/ToolChains/Hexagon.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "Hexagon.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/Hurd.cpp b/clang/lib/Driver/ToolChains/Hurd.cpp
index 0bc114b..a22a8fa 100644
--- a/clang/lib/Driver/ToolChains/Hurd.cpp
+++ b/clang/lib/Driver/ToolChains/Hurd.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "Hurd.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "llvm/Support/Path.h"
diff --git a/clang/lib/Driver/ToolChains/InterfaceStubs.cpp b/clang/lib/Driver/ToolChains/InterfaceStubs.cpp
index 05a13db8..59a6742 100644
--- a/clang/lib/Driver/ToolChains/InterfaceStubs.cpp
+++ b/clang/lib/Driver/ToolChains/InterfaceStubs.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "InterfaceStubs.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "llvm/Support/Path.h"
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 19919cf..151b2bf 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -12,8 +12,8 @@
#include "Arch/Mips.h"
#include "Arch/PPC.h"
#include "Arch/RISCV.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Distro.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/MSP430.cpp b/clang/lib/Driver/ToolChains/MSP430.cpp
index be0f9f2..9eca1ad 100644
--- a/clang/lib/Driver/ToolChains/MSP430.cpp
+++ b/clang/lib/Driver/ToolChains/MSP430.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "MSP430.h"
-#include "CommonArgs.h"
#include "Gnu.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Multilib.h"
diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
index a14691c..1e24486 100644
--- a/clang/lib/Driver/ToolChains/MSVC.cpp
+++ b/clang/lib/Driver/ToolChains/MSVC.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "MSVC.h"
-#include "CommonArgs.h"
#include "Darwin.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp
index 2245b03..7d093d2 100644
--- a/clang/lib/Driver/ToolChains/MinGW.cpp
+++ b/clang/lib/Driver/ToolChains/MinGW.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "MinGW.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/NaCl.cpp b/clang/lib/Driver/ToolChains/NaCl.cpp
index ab61961..f7acaa1 100644
--- a/clang/lib/Driver/ToolChains/NaCl.cpp
+++ b/clang/lib/Driver/ToolChains/NaCl.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "NaCl.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/NetBSD.cpp b/clang/lib/Driver/ToolChains/NetBSD.cpp
index ae164be..8db00de 100644
--- a/clang/lib/Driver/ToolChains/NetBSD.cpp
+++ b/clang/lib/Driver/ToolChains/NetBSD.cpp
@@ -10,8 +10,8 @@
#include "Arch/ARM.h"
#include "Arch/Mips.h"
#include "Arch/Sparc.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/OHOS.cpp b/clang/lib/Driver/ToolChains/OHOS.cpp
index 72f36d0..0099150 100644
--- a/clang/lib/Driver/ToolChains/OHOS.cpp
+++ b/clang/lib/Driver/ToolChains/OHOS.cpp
@@ -8,8 +8,8 @@
#include "OHOS.h"
#include "Arch/ARM.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/OpenBSD.cpp b/clang/lib/Driver/ToolChains/OpenBSD.cpp
index 6686262..79b1b69 100644
--- a/clang/lib/Driver/ToolChains/OpenBSD.cpp
+++ b/clang/lib/Driver/ToolChains/OpenBSD.cpp
@@ -10,8 +10,8 @@
#include "Arch/ARM.h"
#include "Arch/Mips.h"
#include "Arch/Sparc.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/SanitizerArgs.h"
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index cb56a7e..e965786d2 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "PS4CPU.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp
index d88ddc264..42bbc13 100644
--- a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp
+++ b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "RISCVToolchain.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/InputInfo.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/SPIRV.cpp b/clang/lib/Driver/ToolChains/SPIRV.cpp
index d9292cf..ea824db 100644
--- a/clang/lib/Driver/ToolChains/SPIRV.cpp
+++ b/clang/lib/Driver/ToolChains/SPIRV.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
#include "SPIRV.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/InputInfo.h"
diff --git a/clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp b/clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp
index a688fd8..4e09d5e 100644
--- a/clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp
+++ b/clang/lib/Driver/ToolChains/SPIRVOpenMP.cpp
@@ -6,7 +6,7 @@
//
//==------------------------------------------------------------------------==//
#include "SPIRVOpenMP.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
using namespace clang::driver;
using namespace clang::driver::toolchains;
diff --git a/clang/lib/Driver/ToolChains/SYCL.cpp b/clang/lib/Driver/ToolChains/SYCL.cpp
index 6611c14..0232b04 100644
--- a/clang/lib/Driver/ToolChains/SYCL.cpp
+++ b/clang/lib/Driver/ToolChains/SYCL.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
#include "SYCL.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
using namespace clang::driver;
using namespace clang::driver::toolchains;
diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp b/clang/lib/Driver/ToolChains/Solaris.cpp
index 48d1002..a3574e1 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -7,10 +7,10 @@
//===----------------------------------------------------------------------===//
#include "Solaris.h"
-#include "CommonArgs.h"
#include "Gnu.h"
#include "clang/Basic/LangStandard.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/UEFI.cpp b/clang/lib/Driver/ToolChains/UEFI.cpp
index 2ef719b..ac6668e 100644
--- a/clang/lib/Driver/ToolChains/UEFI.cpp
+++ b/clang/lib/Driver/ToolChains/UEFI.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "UEFI.h"
-#include "CommonArgs.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/VEToolchain.cpp b/clang/lib/Driver/ToolChains/VEToolchain.cpp
index cf85a69..ad91290 100644
--- a/clang/lib/Driver/ToolChains/VEToolchain.cpp
+++ b/clang/lib/Driver/ToolChains/VEToolchain.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "VEToolchain.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/WebAssembly.cpp b/clang/lib/Driver/ToolChains/WebAssembly.cpp
index b3ed496..5054868 100644
--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
@@ -7,9 +7,9 @@
//===----------------------------------------------------------------------===//
#include "WebAssembly.h"
-#include "CommonArgs.h"
#include "Gnu.h"
#include "clang/Config/config.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/XCore.cpp b/clang/lib/Driver/ToolChains/XCore.cpp
index c95ebab..6a2a75c 100644
--- a/clang/lib/Driver/ToolChains/XCore.cpp
+++ b/clang/lib/Driver/ToolChains/XCore.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "XCore.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
diff --git a/clang/lib/Driver/ToolChains/ZOS.cpp b/clang/lib/Driver/ToolChains/ZOS.cpp
index d052029..57bcb3c 100644
--- a/clang/lib/Driver/ToolChains/ZOS.cpp
+++ b/clang/lib/Driver/ToolChains/ZOS.cpp
@@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
#include "ZOS.h"
-#include "CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Options.h"
#include "llvm/Option/ArgList.h"
diff --git a/clang/lib/Driver/XRayArgs.cpp b/clang/lib/Driver/XRayArgs.cpp
index 701dd29..ceed7cb 100644
--- a/clang/lib/Driver/XRayArgs.cpp
+++ b/clang/lib/Driver/XRayArgs.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
#include "clang/Driver/XRayArgs.h"
-#include "ToolChains/CommonArgs.h"
+#include "clang/Driver/CommonArgs.h"
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/ToolChain.h"