diff options
Diffstat (limited to 'lib/Driver')
-rw-r--r-- | lib/Driver/Action.cpp | 1 | ||||
-rw-r--r-- | lib/Driver/ArgList.cpp | 1 | ||||
-rw-r--r-- | lib/Driver/CC1AsOptions.cpp | 2 | ||||
-rw-r--r-- | lib/Driver/Compilation.cpp | 6 | ||||
-rw-r--r-- | lib/Driver/Driver.cpp | 20 | ||||
-rw-r--r-- | lib/Driver/InputInfo.h | 2 | ||||
-rw-r--r-- | lib/Driver/Job.cpp | 2 | ||||
-rw-r--r-- | lib/Driver/OptTable.cpp | 2 | ||||
-rw-r--r-- | lib/Driver/Option.cpp | 7 | ||||
-rw-r--r-- | lib/Driver/Phases.cpp | 1 | ||||
-rw-r--r-- | lib/Driver/SanitizerArgs.h | 5 | ||||
-rw-r--r-- | lib/Driver/ToolChain.cpp | 3 | ||||
-rw-r--r-- | lib/Driver/ToolChains.cpp | 17 | ||||
-rw-r--r-- | lib/Driver/ToolChains.h | 6 | ||||
-rw-r--r-- | lib/Driver/Tools.cpp | 17 | ||||
-rw-r--r-- | lib/Driver/Tools.h | 1 | ||||
-rw-r--r-- | lib/Driver/Types.cpp | 3 | ||||
-rw-r--r-- | lib/Driver/WindowsToolChain.cpp | 3 |
18 files changed, 38 insertions, 61 deletions
diff --git a/lib/Driver/Action.cpp b/lib/Driver/Action.cpp index d7b4bc7053..2b5bbee3db 100644 --- a/lib/Driver/Action.cpp +++ b/lib/Driver/Action.cpp @@ -9,7 +9,6 @@ #include "clang/Driver/Action.h" #include "llvm/Support/ErrorHandling.h" - #include <cassert> using namespace clang::driver; diff --git a/lib/Driver/ArgList.cpp b/lib/Driver/ArgList.cpp index b3a43df980..84fae6ad69 100644 --- a/lib/Driver/ArgList.cpp +++ b/lib/Driver/ArgList.cpp @@ -11,7 +11,6 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Option.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Driver/CC1AsOptions.cpp b/lib/Driver/CC1AsOptions.cpp index 4f89b73a46..9048043836 100644 --- a/lib/Driver/CC1AsOptions.cpp +++ b/lib/Driver/CC1AsOptions.cpp @@ -8,8 +8,8 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/CC1AsOptions.h" -#include "clang/Driver/Option.h" #include "clang/Driver/OptTable.h" +#include "clang/Driver/Option.h" using namespace clang; using namespace clang::driver; using namespace clang::driver::options; diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index c1578e6a26..f550a2746e 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -8,20 +8,18 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Compilation.h" - #include "clang/Driver/Action.h" #include "clang/Driver/ArgList.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Options.h" #include "clang/Driver/ToolChain.h" - #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Program.h" -#include <sys/stat.h> +#include "llvm/Support/raw_ostream.h" #include <errno.h> +#include <sys/stat.h> using namespace clang::driver; using namespace clang; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 1e1695c72f..cea24fdb15 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -8,7 +8,10 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Driver.h" - +#include "InputInfo.h" +#include "ToolChains.h" +#include "clang/Basic/Version.h" +#include "clang/Config/config.h" #include "clang/Driver/Action.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" @@ -20,26 +23,17 @@ #include "clang/Driver/Options.h" #include "clang/Driver/Tool.h" #include "clang/Driver/ToolChain.h" - -#include "clang/Basic/Version.h" - #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/StringSet.h" #include "llvm/ADT/OwningPtr.h" +#include "llvm/ADT/StringSet.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" +#include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Program.h" - -#include "InputInfo.h" -#include "ToolChains.h" - +#include "llvm/Support/raw_ostream.h" #include <map> -#include "clang/Config/config.h" - using namespace clang::driver; using namespace clang; diff --git a/lib/Driver/InputInfo.h b/lib/Driver/InputInfo.h index 2a2f4b995d..a243d322ee 100644 --- a/lib/Driver/InputInfo.h +++ b/lib/Driver/InputInfo.h @@ -10,8 +10,8 @@ #ifndef CLANG_LIB_DRIVER_INPUTINFO_H_ #define CLANG_LIB_DRIVER_INPUTINFO_H_ +#include "clang/Driver/Arg.h" #include "clang/Driver/Types.h" - #include <cassert> #include <string> diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp index 825c86a826..8c467050d5 100644 --- a/lib/Driver/Job.cpp +++ b/lib/Driver/Job.cpp @@ -8,9 +8,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Job.h" - #include "llvm/ADT/STLExtras.h" - #include <cassert> using namespace clang::driver; diff --git a/lib/Driver/OptTable.cpp b/lib/Driver/OptTable.cpp index 6e7b6951fb..20214a68d5 100644 --- a/lib/Driver/OptTable.cpp +++ b/lib/Driver/OptTable.cpp @@ -12,8 +12,8 @@ #include "clang/Driver/ArgList.h" #include "clang/Driver/Option.h" #include "clang/Driver/Options.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/raw_ostream.h" #include <algorithm> #include <map> using namespace clang::driver; diff --git a/lib/Driver/Option.cpp b/lib/Driver/Option.cpp index 9a34df5903..dbc61ea3a4 100644 --- a/lib/Driver/Option.cpp +++ b/lib/Driver/Option.cpp @@ -8,14 +8,13 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Option.h" - #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "llvm/Support/raw_ostream.h" -#include "llvm/Support/ErrorHandling.h" #include "llvm/ADT/Twine.h" -#include <cassert> +#include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/raw_ostream.h" #include <algorithm> +#include <cassert> using namespace clang::driver; Option::Option(const OptTable::Info *info, const OptTable *owner) diff --git a/lib/Driver/Phases.cpp b/lib/Driver/Phases.cpp index b885eeef98..155e53b64f 100644 --- a/lib/Driver/Phases.cpp +++ b/lib/Driver/Phases.cpp @@ -9,7 +9,6 @@ #include "clang/Driver/Phases.h" #include "llvm/Support/ErrorHandling.h" - #include <cassert> using namespace clang::driver; diff --git a/lib/Driver/SanitizerArgs.h b/lib/Driver/SanitizerArgs.h index 71813c5511..debdaebc00 100644 --- a/lib/Driver/SanitizerArgs.h +++ b/lib/Driver/SanitizerArgs.h @@ -9,7 +9,12 @@ #ifndef CLANG_LIB_DRIVER_SANITIZERARGS_H_ #define CLANG_LIB_DRIVER_SANITIZERARGS_H_ +#include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" +#include "clang/Driver/Driver.h" +#include "clang/Driver/DriverDiagnostic.h" +#include "clang/Driver/Options.h" +#include "llvm/ADT/StringSwitch.h" namespace clang { namespace driver { diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index 8907b2ba97..df7de736e8 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/ToolChain.h" - +#include "clang/Basic/ObjCRuntime.h" #include "clang/Driver/Action.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" @@ -18,7 +18,6 @@ #include "clang/Driver/Options.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorHandling.h" -#include "clang/Basic/ObjCRuntime.h" using namespace clang::driver; using namespace clang; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 525c05c3e7..0f1a40050d 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -8,7 +8,10 @@ //===----------------------------------------------------------------------===// #include "ToolChains.h" - +#include "SanitizerArgs.h" +#include "clang/Basic/ObjCRuntime.h" +#include "clang/Basic/Version.h" +#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" #include "clang/Driver/Compilation.h" @@ -17,26 +20,18 @@ #include "clang/Driver/OptTable.h" #include "clang/Driver/Option.h" #include "clang/Driver/Options.h" -#include "clang/Basic/ObjCRuntime.h" -#include "clang/Basic/Version.h" - +#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Path.h" +#include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - -#include "SanitizerArgs.h" - #include <cstdlib> // ::getenv -#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX - using namespace clang::driver; using namespace clang::driver::toolchains; using namespace clang; diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 4e0320e929..652dec79b2 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -10,15 +10,13 @@ #ifndef CLANG_LIB_DRIVER_TOOLCHAINS_H_ #define CLANG_LIB_DRIVER_TOOLCHAINS_H_ +#include "Tools.h" +#include "clang/Basic/VersionTuple.h" #include "clang/Driver/Action.h" #include "clang/Driver/ToolChain.h" - -#include "clang/Basic/VersionTuple.h" #include "llvm/ADT/DenseMap.h" #include "llvm/Support/Compiler.h" -#include "Tools.h" - namespace clang { namespace driver { namespace toolchains { diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index e93fa108d9..ab00118244 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -8,33 +8,30 @@ //===----------------------------------------------------------------------===// #include "Tools.h" - +#include "InputInfo.h" +#include "SanitizerArgs.h" +#include "ToolChains.h" +#include "clang/Basic/ObjCRuntime.h" #include "clang/Driver/Action.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" +#include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" -#include "clang/Driver/Compilation.h" #include "clang/Driver/Job.h" #include "clang/Driver/Option.h" #include "clang/Driver/Options.h" #include "clang/Driver/ToolChain.h" #include "clang/Driver/Util.h" -#include "clang/Basic/ObjCRuntime.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/Twine.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Format.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Host.h" #include "llvm/Support/Process.h" -#include "llvm/Support/ErrorHandling.h" - -#include "InputInfo.h" -#include "SanitizerArgs.h" -#include "ToolChains.h" +#include "llvm/Support/raw_ostream.h" using namespace clang::driver; using namespace clang::driver::tools; diff --git a/lib/Driver/Tools.h b/lib/Driver/Tools.h index cef7d80d98..be38edb034 100644 --- a/lib/Driver/Tools.h +++ b/lib/Driver/Tools.h @@ -13,7 +13,6 @@ #include "clang/Driver/Tool.h" #include "clang/Driver/Types.h" #include "clang/Driver/Util.h" - #include "llvm/ADT/Triple.h" #include "llvm/Support/Compiler.h" diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index 0727654038..cab6dcc327 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -8,10 +8,9 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Types.h" - #include "llvm/ADT/StringSwitch.h" -#include <string.h> #include <cassert> +#include <string.h> using namespace clang::driver; using namespace clang::driver::types; diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index de2d5352b7..454d2c132b 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/lib/Driver/WindowsToolChain.cpp @@ -8,13 +8,12 @@ //===----------------------------------------------------------------------===// #include "ToolChains.h" - +#include "clang/Basic/Version.h" #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Options.h" -#include "clang/Basic/Version.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Path.h" |