From f1653b52607ff61bbca32af141c7f71827a9a613 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Tue, 17 Jun 2014 13:10:38 +0000 Subject: [PATCH] Move SetTheory from utils/TableGen into lib/TableGen so Clang can use it. llvm-svn: 211100 --- llvm/{utils => include/llvm}/TableGen/SetTheory.h | 0 llvm/lib/TableGen/CMakeLists.txt | 1 + llvm/{utils => lib}/TableGen/SetTheory.cpp | 2 +- llvm/utils/TableGen/CMakeLists.txt | 1 - llvm/utils/TableGen/CodeGenRegisters.h | 2 +- llvm/utils/TableGen/CodeGenSchedule.h | 2 +- llvm/utils/TableGen/TableGen.cpp | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename llvm/{utils => include/llvm}/TableGen/SetTheory.h (100%) rename llvm/{utils => lib}/TableGen/SetTheory.cpp (99%) diff --git a/llvm/utils/TableGen/SetTheory.h b/llvm/include/llvm/TableGen/SetTheory.h similarity index 100% rename from llvm/utils/TableGen/SetTheory.h rename to llvm/include/llvm/TableGen/SetTheory.h diff --git a/llvm/lib/TableGen/CMakeLists.txt b/llvm/lib/TableGen/CMakeLists.txt index 935d674..fb70218 100644 --- a/llvm/lib/TableGen/CMakeLists.txt +++ b/llvm/lib/TableGen/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_library(LLVMTableGen Error.cpp Main.cpp Record.cpp + SetTheory.cpp StringMatcher.cpp TableGenBackend.cpp TGLexer.cpp diff --git a/llvm/utils/TableGen/SetTheory.cpp b/llvm/lib/TableGen/SetTheory.cpp similarity index 99% rename from llvm/utils/TableGen/SetTheory.cpp rename to llvm/lib/TableGen/SetTheory.cpp index 5ead7ed..c99c2ba 100644 --- a/llvm/utils/TableGen/SetTheory.cpp +++ b/llvm/lib/TableGen/SetTheory.cpp @@ -12,10 +12,10 @@ // //===----------------------------------------------------------------------===// -#include "SetTheory.h" #include "llvm/Support/Format.h" #include "llvm/TableGen/Error.h" #include "llvm/TableGen/Record.h" +#include "llvm/TableGen/SetTheory.h" using namespace llvm; diff --git a/llvm/utils/TableGen/CMakeLists.txt b/llvm/utils/TableGen/CMakeLists.txt index f277608..feaa7c7 100644 --- a/llvm/utils/TableGen/CMakeLists.txt +++ b/llvm/utils/TableGen/CMakeLists.txt @@ -26,7 +26,6 @@ add_tablegen(llvm-tblgen LLVM OptParserEmitter.cpp PseudoLoweringEmitter.cpp RegisterInfoEmitter.cpp - SetTheory.cpp SubtargetEmitter.cpp TableGen.cpp X86DisassemblerTables.cpp diff --git a/llvm/utils/TableGen/CodeGenRegisters.h b/llvm/utils/TableGen/CodeGenRegisters.h index 30732c8..278315b 100644 --- a/llvm/utils/TableGen/CodeGenRegisters.h +++ b/llvm/utils/TableGen/CodeGenRegisters.h @@ -15,7 +15,6 @@ #ifndef CODEGEN_REGISTERS_H #define CODEGEN_REGISTERS_H -#include "SetTheory.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/BitVector.h" #include "llvm/ADT/DenseMap.h" @@ -23,6 +22,7 @@ #include "llvm/CodeGen/MachineValueType.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/TableGen/Record.h" +#include "llvm/TableGen/SetTheory.h" #include #include #include diff --git a/llvm/utils/TableGen/CodeGenSchedule.h b/llvm/utils/TableGen/CodeGenSchedule.h index 65ac602..3fef8ad 100644 --- a/llvm/utils/TableGen/CodeGenSchedule.h +++ b/llvm/utils/TableGen/CodeGenSchedule.h @@ -15,11 +15,11 @@ #ifndef CODEGEN_SCHEDULE_H #define CODEGEN_SCHEDULE_H -#include "SetTheory.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/StringMap.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/TableGen/Record.h" +#include "llvm/TableGen/SetTheory.h" namespace llvm { diff --git a/llvm/utils/TableGen/TableGen.cpp b/llvm/utils/TableGen/TableGen.cpp index 00c3a6f..bbd61f5 100644 --- a/llvm/utils/TableGen/TableGen.cpp +++ b/llvm/utils/TableGen/TableGen.cpp @@ -12,13 +12,13 @@ //===----------------------------------------------------------------------===// #include "TableGenBackends.h" // Declares all backends. -#include "SetTheory.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Signals.h" #include "llvm/TableGen/Error.h" #include "llvm/TableGen/Main.h" #include "llvm/TableGen/Record.h" +#include "llvm/TableGen/SetTheory.h" using namespace llvm; -- 2.7.4