summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaxun (Sam) Liu <yaxun.liu@amd.com>2019-12-22 00:34:14 -0500
committerYaxun (Sam) Liu <yaxun.liu@amd.com>2019-12-23 08:11:23 -0500
commiteca40066ebb5759aa44d21833c7a1fd7dd2361af (patch)
treed9bf75998d88768d808e078e029c0a5d3f4bba5f
parent109e4e3851e29e0d3357cd1a6a38155928c07d8a (diff)
downloadbcm5719-llvm-eca40066ebb5759aa44d21833c7a1fd7dd2361af.tar.gz
bcm5719-llvm-eca40066ebb5759aa44d21833c7a1fd7dd2361af.zip
[NFC] Move OptionUtils from Basic to Driver
Differential Revision: https://reviews.llvm.org/D71802
-rw-r--r--clang/include/clang/Driver/OptionUtils.h (renamed from clang/include/clang/Basic/OptionUtils.h)6
-rw-r--r--clang/include/clang/Frontend/Utils.h2
-rw-r--r--clang/lib/Basic/CMakeLists.txt2
-rw-r--r--clang/lib/Driver/CMakeLists.txt1
-rw-r--r--clang/lib/Driver/OptionUtils.cpp (renamed from clang/lib/Basic/OptionUtils.cpp)2
5 files changed, 6 insertions, 7 deletions
diff --git a/clang/include/clang/Basic/OptionUtils.h b/clang/include/clang/Driver/OptionUtils.h
index 6254f758c2f..922f536bf33 100644
--- a/clang/include/clang/Basic/OptionUtils.h
+++ b/clang/include/clang/Driver/OptionUtils.h
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_BASIC_OPTIONUTILS_H
-#define LLVM_CLANG_BASIC_OPTIONUTILS_H
+#ifndef LLVM_CLANG_DRIVER_OPTIONUTILS_H
+#define LLVM_CLANG_DRIVER_OPTIONUTILS_H
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LLVM.h"
@@ -55,4 +55,4 @@ inline uint64_t getLastArgUInt64Value(const llvm::opt::ArgList &Args,
} // namespace clang
-#endif // LLVM_CLANG_BASIC_OPTIONUTILS_H
+#endif // LLVM_CLANG_DRIVER_OPTIONUTILS_H
diff --git a/clang/include/clang/Frontend/Utils.h b/clang/include/clang/Frontend/Utils.h
index d5990d56ba2..b5834921b9e 100644
--- a/clang/include/clang/Frontend/Utils.h
+++ b/clang/include/clang/Frontend/Utils.h
@@ -15,7 +15,7 @@
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LLVM.h"
-#include "clang/Basic/OptionUtils.h"
+#include "clang/Driver/OptionUtils.h"
#include "clang/Frontend/DependencyOutputOptions.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
index b54d261b9d1..be739c70468 100644
--- a/clang/lib/Basic/CMakeLists.txt
+++ b/clang/lib/Basic/CMakeLists.txt
@@ -1,7 +1,6 @@
set(LLVM_LINK_COMPONENTS
Core
MC
- Option
Support
)
@@ -56,7 +55,6 @@ add_clang_library(clangBasic
ObjCRuntime.cpp
OpenMPKinds.cpp
OperatorPrecedence.cpp
- OptionUtils.cpp
SanitizerBlacklist.cpp
SanitizerSpecialCaseList.cpp
Sanitizers.cpp
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index eb76cd3dcad..6f25d3588eb 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -19,6 +19,7 @@ add_clang_library(clangDriver
DriverOptions.cpp
Job.cpp
Multilib.cpp
+ OptionUtils.cpp
Phases.cpp
SanitizerArgs.cpp
Tool.cpp
diff --git a/clang/lib/Basic/OptionUtils.cpp b/clang/lib/Driver/OptionUtils.cpp
index e33c233b58b..1f36ffc03ca 100644
--- a/clang/lib/Basic/OptionUtils.cpp
+++ b/clang/lib/Driver/OptionUtils.cpp
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Basic/OptionUtils.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticDriver.h"
+#include "clang/Driver/OptionUtils.h"
#include "llvm/Option/ArgList.h"
using namespace clang;
OpenPOWER on IntegriCloud