From 4a1a77c1c9e0992735aa66b75c9e4c75c3b70561 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Mon, 22 Sep 2008 20:50:40 +0000 Subject: [PATCH] Move llvmc2 header files under include/llvm/CompilerDriver git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56466 91177308-0d34-0410-b5e6-96231b3b80d8 --- {tools/llvmc2 => include/llvm/CompilerDriver}/Action.h | 0 .../llvm/CompilerDriver}/CompilationGraph.h | 2 +- {tools/llvmc2 => include/llvm/CompilerDriver}/Plugin.h | 0 {tools/llvmc2 => include/llvm/CompilerDriver}/Tool.h | 2 +- tools/llvmc2/Action.cpp | 2 +- tools/llvmc2/CompilationGraph.cpp | 2 +- tools/llvmc2/Plugin.cpp | 2 +- tools/llvmc2/llvmc.cpp | 5 +++-- tools/llvmc2/plugins/Hello/Hello.cpp | 7 ++----- utils/TableGen/LLVMCConfigurationEmitter.cpp | 6 +++--- 10 files changed, 13 insertions(+), 15 deletions(-) rename {tools/llvmc2 => include/llvm/CompilerDriver}/Action.h (100%) rename {tools/llvmc2 => include/llvm/CompilerDriver}/CompilationGraph.h (99%) rename {tools/llvmc2 => include/llvm/CompilerDriver}/Plugin.h (100%) rename {tools/llvmc2 => include/llvm/CompilerDriver}/Tool.h (98%) diff --git a/tools/llvmc2/Action.h b/include/llvm/CompilerDriver/Action.h similarity index 100% rename from tools/llvmc2/Action.h rename to include/llvm/CompilerDriver/Action.h diff --git a/tools/llvmc2/CompilationGraph.h b/include/llvm/CompilerDriver/CompilationGraph.h similarity index 99% rename from tools/llvmc2/CompilationGraph.h rename to include/llvm/CompilerDriver/CompilationGraph.h index 57758bfd9e0..f3c31ab22c8 100644 --- a/tools/llvmc2/CompilationGraph.h +++ b/include/llvm/CompilerDriver/CompilationGraph.h @@ -14,7 +14,7 @@ #ifndef LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H #define LLVM_TOOLS_LLVMC2_COMPILATION_GRAPH_H -#include "Tool.h" +#include "llvm/CompilerDriver/Tool.h" #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" diff --git a/tools/llvmc2/Plugin.h b/include/llvm/CompilerDriver/Plugin.h similarity index 100% rename from tools/llvmc2/Plugin.h rename to include/llvm/CompilerDriver/Plugin.h diff --git a/tools/llvmc2/Tool.h b/include/llvm/CompilerDriver/Tool.h similarity index 98% rename from tools/llvmc2/Tool.h rename to include/llvm/CompilerDriver/Tool.h index 6f7cb8d051c..c422a439923 100644 --- a/tools/llvmc2/Tool.h +++ b/include/llvm/CompilerDriver/Tool.h @@ -14,7 +14,7 @@ #ifndef LLVM_TOOLS_LLVMC2_TOOL_H #define LLVM_TOOLS_LLVMC2_TOOL_H -#include "Action.h" +#include "llvm/CompilerDriver/Action.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/StringSet.h" diff --git a/tools/llvmc2/Action.cpp b/tools/llvmc2/Action.cpp index 08416263a1b..c0a1b849bcd 100644 --- a/tools/llvmc2/Action.cpp +++ b/tools/llvmc2/Action.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Action.h" +#include "llvm/CompilerDriver/Action.h" #include "llvm/Support/CommandLine.h" #include "llvm/System/Program.h" diff --git a/tools/llvmc2/CompilationGraph.cpp b/tools/llvmc2/CompilationGraph.cpp index 01953957045..2e83f44f67f 100644 --- a/tools/llvmc2/CompilationGraph.cpp +++ b/tools/llvmc2/CompilationGraph.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "Error.h" -#include "CompilationGraph.h" +#include "llvm/CompilerDriver/CompilationGraph.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/CommandLine.h" diff --git a/tools/llvmc2/Plugin.cpp b/tools/llvmc2/Plugin.cpp index 70d99878ba9..cd94a013205 100644 --- a/tools/llvmc2/Plugin.cpp +++ b/tools/llvmc2/Plugin.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "Plugin.h" +#include "llvm/CompilerDriver/Plugin.h" #include diff --git a/tools/llvmc2/llvmc.cpp b/tools/llvmc2/llvmc.cpp index bd5ea2b73f4..592a1333f3a 100644 --- a/tools/llvmc2/llvmc.cpp +++ b/tools/llvmc2/llvmc.cpp @@ -14,9 +14,10 @@ // //===----------------------------------------------------------------------===// -#include "CompilationGraph.h" #include "Error.h" -#include "Plugin.h" + +#include "llvm/CompilerDriver/CompilationGraph.h" +#include "llvm/CompilerDriver/Plugin.h" #include "llvm/System/Path.h" #include "llvm/Support/CommandLine.h" diff --git a/tools/llvmc2/plugins/Hello/Hello.cpp b/tools/llvmc2/plugins/Hello/Hello.cpp index 729d3c81667..a243dd86f7e 100644 --- a/tools/llvmc2/plugins/Hello/Hello.cpp +++ b/tools/llvmc2/plugins/Hello/Hello.cpp @@ -11,11 +11,8 @@ // //===----------------------------------------------------------------------===// -// TODO: Since llvmc2 has now gained support for plugins, its header -// files should be probably moved into LLVM include dir. - -#include "../../CompilationGraph.h" -#include "../../Plugin.h" +#include "llvm/CompilerDriver/CompilationGraph.h" +#include "llvm/CompilerDriver/Plugin.h" #include diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index 9bb3be3747e..43729033c39 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -1722,9 +1722,9 @@ void EmitRegisterPlugin(std::ostream& O) { /// EmitInclude - Emit necessary #include directives. void EmitIncludes(std::ostream& O) { - O << "#include \"CompilationGraph.h\"\n" - << "#include \"Plugin.h\"\n" - << "#include \"Tool.h\"\n\n" + O << "#include \"llvm/CompilerDriver/CompilationGraph.h\"\n" + << "#include \"llvm/CompilerDriver/Plugin.h\"\n" + << "#include \"llvm/CompilerDriver/Tool.h\"\n\n" << "#include \"llvm/ADT/StringExtras.h\"\n" << "#include \"llvm/Support/CommandLine.h\"\n\n"