From 551ccae044b0ff658fe629dd67edd5ffe75d10e8 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Wed, 1 Sep 2004 22:55:40 +0000 Subject: Changes For Bug 352 Move include/Config and include/Support into include/llvm/Config, include/llvm/ADT and include/llvm/Support. From here on out, all LLVM public header files must be under include/llvm/. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16137 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/analyze/GraphPrinters.cpp | 2 +- tools/analyze/PrintSCC.cpp | 2 +- tools/analyze/analyze.cpp | 4 ++-- tools/bugpoint/BugDriver.cpp | 4 ++-- tools/bugpoint/CrashDebugger.cpp | 2 +- tools/bugpoint/ExecutionDriver.cpp | 8 ++++---- tools/bugpoint/ExtractFunction.cpp | 6 +++--- tools/bugpoint/Miscompilation.cpp | 4 ++-- tools/bugpoint/OptimizerDriver.cpp | 2 +- tools/bugpoint/ToolRunner.cpp | 6 +++--- tools/bugpoint/ToolRunner.h | 8 ++++---- tools/bugpoint/bugpoint.cpp | 19 +++++++------------ tools/extract/extract.cpp | 2 +- tools/gccas/gccas.cpp | 2 +- tools/gccld/GenerateCode.cpp | 4 ++-- tools/gccld/Linker.cpp | 8 ++++---- tools/gccld/gccld.cpp | 6 +++--- tools/llc/llc.cpp | 4 ++-- tools/llee/ExecveHandler.c | 2 +- tools/llee/OSInterface.h | 2 +- tools/llee/StorageProxy.c | 8 ++++---- tools/llee/SysUtils.c | 12 ++++++------ tools/lli/lli.cpp | 4 ++-- tools/llvm-ar/llvm-ar.cpp | 4 ++-- tools/llvm-as/llvm-as.cpp | 2 +- tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp | 2 +- tools/llvm-db/CLIDebugger.cpp | 2 +- tools/llvm-db/Commands.cpp | 4 ++-- tools/llvm-db/llvm-db.cpp | 4 ++-- tools/llvm-dis/llvm-dis.cpp | 2 +- tools/llvm-extract/llvm-extract.cpp | 2 +- tools/llvm-link/llvm-link.cpp | 4 ++-- tools/llvm-nm/llvm-nm.cpp | 4 ++-- tools/llvm-prof/llvm-prof.cpp | 2 +- tools/llvm-stub/llvm-stub.c | 2 +- tools/llvmc/CompilerDriver.cpp | 6 +++--- tools/llvmc/Configuration.cpp | 6 +++--- tools/llvmc/Configuration.h | 2 +- tools/llvmc/llvmc.cpp | 2 +- tools/opt/GraphPrinters.cpp | 2 +- tools/opt/PrintSCC.cpp | 2 +- tools/opt/opt.cpp | 4 ++-- 42 files changed, 87 insertions(+), 92 deletions(-) (limited to 'tools') diff --git a/tools/analyze/GraphPrinters.cpp b/tools/analyze/GraphPrinters.cpp index fc74c480cf..1176a8df10 100644 --- a/tools/analyze/GraphPrinters.cpp +++ b/tools/analyze/GraphPrinters.cpp @@ -14,7 +14,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/GraphWriter.h" +#include "llvm/Support/GraphWriter.h" #include "llvm/Pass.h" #include "llvm/Value.h" #include "llvm/Analysis/CallGraph.h" diff --git a/tools/analyze/PrintSCC.cpp b/tools/analyze/PrintSCC.cpp index 8911cc36e2..e4af831752 100644 --- a/tools/analyze/PrintSCC.cpp +++ b/tools/analyze/PrintSCC.cpp @@ -29,7 +29,7 @@ #include "llvm/Module.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" #include namespace llvm { diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp index 0207b8c6e1..1542a1a068 100644 --- a/tools/analyze/analyze.cpp +++ b/tools/analyze/analyze.cpp @@ -24,8 +24,8 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/PassNameParser.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Support/Timer.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/Timer.h" #include using namespace llvm; diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp index 1826b7b780..6d13f96711 100644 --- a/tools/bugpoint/BugDriver.cpp +++ b/tools/bugpoint/BugDriver.cpp @@ -20,8 +20,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Support/Linker.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include #include diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index 69837f9c2a..545d767c2a 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -26,7 +26,7 @@ #include "llvm/Support/ToolRunner.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include #include using namespace llvm; diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp index 62f0a242a6..0687c4c08f 100644 --- a/tools/bugpoint/ExecutionDriver.cpp +++ b/tools/bugpoint/ExecutionDriver.cpp @@ -14,10 +14,10 @@ #include "BugDriver.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/FileUtilities.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/Support/SystemUtils.h" #include using namespace llvm; diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index 7806857f2e..cf02ef73a9 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -24,9 +24,9 @@ #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Transforms/Utils/FunctionUtils.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" -#include "Support/Debug.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" #include using namespace llvm; diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp index 0b7711b611..bead5dc992 100644 --- a/tools/bugpoint/Miscompilation.cpp +++ b/tools/bugpoint/Miscompilation.cpp @@ -23,8 +23,8 @@ #include "llvm/Support/Mangler.h" #include "llvm/Transforms/Utils/Cloning.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" using namespace llvm; namespace llvm { diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index c5c437ccdb..23e40fda5c 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -21,7 +21,7 @@ #include "llvm/Analysis/Verifier.h" #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Target/TargetData.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/FileUtilities.h" #include #include #include diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index b694127e07..3dc98451de 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -13,9 +13,9 @@ #define DEBUG_TYPE "toolrunner" #include "llvm/Support/ToolRunner.h" -#include "Config/config.h" // for HAVE_LINK_R -#include "Support/Debug.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" // for HAVE_LINK_R +#include "llvm/Support/Debug.h" +#include "llvm/Support/FileUtilities.h" #include #include using namespace llvm; diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index bd085eab6d..c5d89da46d 100644 --- a/tools/bugpoint/ToolRunner.h +++ b/tools/bugpoint/ToolRunner.h @@ -1,4 +1,4 @@ -//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===// +//===-- llvm/Support/ToolRunner.h -------------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -14,10 +14,10 @@ // //===----------------------------------------------------------------------===// -#ifndef TOOLRUNNER_H -#define TOOLRUNNER_H +#ifndef LLVM_SUPPORT_TOOLRUNNER_H +#define LLVM_SUPPORT_TOOLRUNNER_H -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include #include diff --git a/tools/bugpoint/bugpoint.cpp b/tools/bugpoint/bugpoint.cpp index 1ff84f2408..a4eae3cecd 100644 --- a/tools/bugpoint/bugpoint.cpp +++ b/tools/bugpoint/bugpoint.cpp @@ -16,11 +16,12 @@ #include "BugDriver.h" #include "llvm/Support/PassNameParser.h" #include "llvm/Support/ToolRunner.h" -#include "Support/CommandLine.h" +#include "llvm/System/SysConfig.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Config/unistd.h" -#include +#include "llvm/Config/unistd.h" +//#include using namespace llvm; static cl::list @@ -45,14 +46,8 @@ int main(int argc, char **argv) { D.addPasses(PassList.begin(), PassList.end()); // Bugpoint has the ability of generating a plethora of core files, so to - // avoid filling up the disk, set the max core file size to 0. - struct rlimit rlim; - rlim.rlim_cur = rlim.rlim_max = 0; - int res = setrlimit(RLIMIT_CORE, &rlim); - if (res < 0) { - // setrlimit() may have failed, but we're not going to let that stop us - perror("setrlimit: RLIMIT_CORE"); - } + // avoid filling up the disk, we prevent it + sys::PreventCoreFiles(); try { return D.run(); diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp index 050793b2e6..95822d0389 100644 --- a/tools/extract/extract.cpp +++ b/tools/extract/extract.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/IPO.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp index c5f6c2395a..ab64bbf18f 100644 --- a/tools/gccas/gccas.cpp +++ b/tools/gccas/gccas.cpp @@ -22,7 +22,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp index 029d5b90fd..633517d09d 100644 --- a/tools/gccld/GenerateCode.cpp +++ b/tools/gccld/GenerateCode.cpp @@ -24,8 +24,8 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Support/SystemUtils.h" -#include "Support/CommandLine.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Support/CommandLine.h" using namespace llvm; namespace { diff --git a/tools/gccld/Linker.cpp b/tools/gccld/Linker.cpp index fcaa7af3d5..fa9ec70306 100644 --- a/tools/gccld/Linker.cpp +++ b/tools/gccld/Linker.cpp @@ -21,11 +21,11 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Config/config.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include #include #include diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp index ba4681534d..9137124f19 100644 --- a/tools/gccld/gccld.cpp +++ b/tools/gccld/gccld.cpp @@ -29,10 +29,10 @@ #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" #include #include using namespace llvm; diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 0d35ea20aa..4e1e0cce7b 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -20,8 +20,8 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/Pass.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llee/ExecveHandler.c b/tools/llee/ExecveHandler.c index 088f1dba53..89d1536538 100644 --- a/tools/llee/ExecveHandler.c +++ b/tools/llee/ExecveHandler.c @@ -13,7 +13,7 @@ \*===----------------------------------------------------------------------===*/ #include "SysUtils.h" -#include "Config/unistd.h" +#include "llvm/Config/unistd.h" #include #include #include diff --git a/tools/llee/OSInterface.h b/tools/llee/OSInterface.h index 26b48fd1af..0e026e10b1 100644 --- a/tools/llee/OSInterface.h +++ b/tools/llee/OSInterface.h @@ -16,7 +16,7 @@ #ifndef OS_INTERFACE_H #define OS_INTERFACE_H -#include "Config/sys/types.h" +#include "llvm/Config/sys/types.h" struct stat; diff --git a/tools/llee/StorageProxy.c b/tools/llee/StorageProxy.c index 656d3164cf..05ffdf4b4c 100644 --- a/tools/llee/StorageProxy.c +++ b/tools/llee/StorageProxy.c @@ -7,10 +7,10 @@ #include "OSInterface.h" #include "SysUtils.h" -#include "Config/fcntl.h" -#include "Config/unistd.h" -#include "Config/sys/types.h" -#include "Config/sys/stat.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/stat.h" #include #include #include diff --git a/tools/llee/SysUtils.c b/tools/llee/SysUtils.c index d7bab1d989..0325c40b9d 100644 --- a/tools/llee/SysUtils.c +++ b/tools/llee/SysUtils.c @@ -13,12 +13,12 @@ \*===----------------------------------------------------------------------===*/ #include "SysUtils.h" -#include "Config/dlfcn.h" -#include "Config/fcntl.h" -#include "Config/unistd.h" -#include "Config/sys/stat.h" -#include "Config/sys/types.h" -#include "Config/sys/wait.h" +#include "llvm/Config/dlfcn.h" +#include "llvm/Config/fcntl.h" +#include "llvm/Config/unistd.h" +#include "llvm/Config/sys/stat.h" +#include "llvm/Config/sys/types.h" +#include "llvm/Config/sys/wait.h" #include #include #include diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 066bfbc9e9..eb8ac0126e 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -19,8 +19,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 4b79cd367d..07fc1810e8 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -13,8 +13,8 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index b49702c32e..1d48f7a7fa 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -19,7 +19,7 @@ #include "llvm/Assembly/Parser.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Analysis/Verifier.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp index e3dff659d2..d4be138fe7 100644 --- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -31,7 +31,7 @@ #include "llvm/Analysis/Verifier.h" #include "llvm/Bytecode/Analyzer.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-db/CLIDebugger.cpp b/tools/llvm-db/CLIDebugger.cpp index c48a919f80..75798d2352 100644 --- a/tools/llvm-db/CLIDebugger.cpp +++ b/tools/llvm-db/CLIDebugger.cpp @@ -15,7 +15,7 @@ #include "CLIDebugger.h" #include "CLICommand.h" #include "llvm/Debugger/SourceFile.h" -#include "Support/StringExtras.h" +#include "llvm/ADT/StringExtras.h" #include using namespace llvm; diff --git a/tools/llvm-db/Commands.cpp b/tools/llvm-db/Commands.cpp index 56dbd53526..6df2f693a1 100644 --- a/tools/llvm-db/Commands.cpp +++ b/tools/llvm-db/Commands.cpp @@ -18,8 +18,8 @@ #include "llvm/Debugger/SourceLanguage.h" #include "llvm/Debugger/SourceFile.h" #include "llvm/Debugger/InferiorProcess.h" -#include "Support/FileUtilities.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/StringExtras.h" #include using namespace llvm; diff --git a/tools/llvm-db/llvm-db.cpp b/tools/llvm-db/llvm-db.cpp index 1b7385c065..23cbca2ef4 100644 --- a/tools/llvm-db/llvm-db.cpp +++ b/tools/llvm-db/llvm-db.cpp @@ -13,8 +13,8 @@ //===----------------------------------------------------------------------===// #include "CLIDebugger.h" -#include "Support/CommandLine.h" -#include "Support/PluginLoader.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/PluginLoader.h" #include "llvm/System/Signals.h" #include diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index ac8101b6c4..37d5c84f75 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -20,7 +20,7 @@ #include "llvm/PassManager.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Assembly/PrintModulePass.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp index 050793b2e6..95822d0389 100644 --- a/tools/llvm-extract/llvm-extract.cpp +++ b/tools/llvm-extract/llvm-extract.cpp @@ -18,7 +18,7 @@ #include "llvm/Bytecode/WriteBytecodePass.h" #include "llvm/Transforms/IPO.h" #include "llvm/Target/TargetData.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 3cd3c7b54d..664529850c 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -17,8 +17,8 @@ #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/Writer.h" #include "llvm/Support/Linker.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index ba8b5d7f0d..1a2b40e9c9 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -18,8 +18,8 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" -#include "Support/FileUtilities.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp index efb44d69b5..88344078bd 100644 --- a/tools/llvm-prof/llvm-prof.cpp +++ b/tools/llvm-prof/llvm-prof.cpp @@ -18,7 +18,7 @@ #include "llvm/Assembly/AsmAnnotationWriter.h" #include "llvm/Analysis/ProfileInfoLoader.h" #include "llvm/Bytecode/Reader.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include "llvm/System/Signals.h" #include #include diff --git a/tools/llvm-stub/llvm-stub.c b/tools/llvm-stub/llvm-stub.c index a64c5df9f4..8d5175af10 100644 --- a/tools/llvm-stub/llvm-stub.c +++ b/tools/llvm-stub/llvm-stub.c @@ -23,7 +23,7 @@ #include #include #include -#include "Config/unistd.h" /* provides definition of execve */ +#include "llvm/Config/unistd.h" /* provides definition of execve */ int main(int argc, char** argv) { const char *Interp = getenv("LLVMINTERP"); diff --git a/tools/llvmc/CompilerDriver.cpp b/tools/llvmc/CompilerDriver.cpp index 51164d2467..c015d9e867 100644 --- a/tools/llvmc/CompilerDriver.cpp +++ b/tools/llvmc/CompilerDriver.cpp @@ -17,9 +17,9 @@ #include "llvm/Module.h" #include "llvm/Bytecode/Reader.h" #include "llvm/System/Signals.h" -#include "Support/FileUtilities.h" -#include "Support/SetVector.h" -#include "Support/StringExtras.h" +#include "llvm/Support/FileUtilities.h" +#include "llvm/ADT/SetVector.h" +#include "llvm/ADT/StringExtras.h" #include using namespace llvm; diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp index c398e529d7..6b5d33975f 100644 --- a/tools/llvmc/Configuration.cpp +++ b/tools/llvmc/Configuration.cpp @@ -15,9 +15,9 @@ #include "Configuration.h" #include "ConfigLexer.h" #include "CompilerDriver.h" -#include "Config/config.h" -#include "Support/CommandLine.h" -#include "Support/StringExtras.h" +#include "llvm/Config/config.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/ADT/StringExtras.h" #include #include diff --git a/tools/llvmc/Configuration.h b/tools/llvmc/Configuration.h index 2ed565a80e..e194dd072e 100644 --- a/tools/llvmc/Configuration.h +++ b/tools/llvmc/Configuration.h @@ -15,7 +15,7 @@ #define LLVM_TOOLS_LLVMC_CONFIGDATA_H #include "CompilerDriver.h" -#include +#include namespace llvm { /// This class provides the high level interface to the LLVM Compiler Driver. diff --git a/tools/llvmc/llvmc.cpp b/tools/llvmc/llvmc.cpp index 8dab301790..f457795a0c 100644 --- a/tools/llvmc/llvmc.cpp +++ b/tools/llvmc/llvmc.cpp @@ -18,7 +18,7 @@ #include "Configuration.h" #include "llvm/Pass.h" #include "llvm/System/Signals.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" #include using namespace llvm; diff --git a/tools/opt/GraphPrinters.cpp b/tools/opt/GraphPrinters.cpp index fc74c480cf..1176a8df10 100644 --- a/tools/opt/GraphPrinters.cpp +++ b/tools/opt/GraphPrinters.cpp @@ -14,7 +14,7 @@ // //===----------------------------------------------------------------------===// -#include "Support/GraphWriter.h" +#include "llvm/Support/GraphWriter.h" #include "llvm/Pass.h" #include "llvm/Value.h" #include "llvm/Analysis/CallGraph.h" diff --git a/tools/opt/PrintSCC.cpp b/tools/opt/PrintSCC.cpp index 8911cc36e2..e4af831752 100644 --- a/tools/opt/PrintSCC.cpp +++ b/tools/opt/PrintSCC.cpp @@ -29,7 +29,7 @@ #include "llvm/Module.h" #include "llvm/Analysis/CallGraph.h" #include "llvm/Support/CFG.h" -#include "Support/SCCIterator.h" +#include "llvm/ADT/SCCIterator.h" #include namespace llvm { diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 4810ebd870..f5666bc08e 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -21,8 +21,8 @@ #include "llvm/Target/TargetMachine.h" #include "llvm/Support/PassNameParser.h" #include "llvm/System/Signals.h" -#include "Support/PluginLoader.h" -#include "Support/SystemUtils.h" +#include "llvm/Support/PluginLoader.h" +#include "llvm/Support/SystemUtils.h" #include #include #include -- cgit v1.2.3