From 3b2a2563322161a609fd6672af2d879c6bd65e8d 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211100 91177308-0d34-0410-b5e6-96231b3b80d8 --- {utils => include/llvm}/TableGen/SetTheory.h | 0 lib/TableGen/CMakeLists.txt | 1 + {utils => lib}/TableGen/SetTheory.cpp | 2 +- utils/TableGen/CMakeLists.txt | 1 - utils/TableGen/CodeGenRegisters.h | 2 +- utils/TableGen/CodeGenSchedule.h | 2 +- utils/TableGen/TableGen.cpp | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {utils => include/llvm}/TableGen/SetTheory.h (100%) rename {utils => lib}/TableGen/SetTheory.cpp (99%) diff --git a/utils/TableGen/SetTheory.h b/include/llvm/TableGen/SetTheory.h similarity index 100% rename from utils/TableGen/SetTheory.h rename to include/llvm/TableGen/SetTheory.h diff --git a/lib/TableGen/CMakeLists.txt b/lib/TableGen/CMakeLists.txt index 935d674a360..fb702187d13 100644 --- a/lib/TableGen/CMakeLists.txt +++ b/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/utils/TableGen/SetTheory.cpp b/lib/TableGen/SetTheory.cpp similarity index 99% rename from utils/TableGen/SetTheory.cpp rename to lib/TableGen/SetTheory.cpp index 5ead7ed16fd..c99c2bab45a 100644 --- a/utils/TableGen/SetTheory.cpp +++ b/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/utils/TableGen/CMakeLists.txt b/utils/TableGen/CMakeLists.txt index f277608d2c8..feaa7c75796 100644 --- a/utils/TableGen/CMakeLists.txt +++ b/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/utils/TableGen/CodeGenRegisters.h b/utils/TableGen/CodeGenRegisters.h index 30732c8e04d..278315ba47b 100644 --- a/utils/TableGen/CodeGenRegisters.h +++ b/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/utils/TableGen/CodeGenSchedule.h b/utils/TableGen/CodeGenSchedule.h index 65ac6020747..3fef8adf91e 100644 --- a/utils/TableGen/CodeGenSchedule.h +++ b/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/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp index 00c3a6fd91f..bbd61f5fb11 100644 --- a/utils/TableGen/TableGen.cpp +++ b/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;