Revert "[llvm-diff] Create libLLVMDiff library"

This reverts commit 9854f2f30f84123ca78aa3603102e7cef4ec33c8 since it
broke all the builds.

diff --git a/llvm/tools/llvm-diff/CMakeLists.txt b/llvm/tools/llvm-diff/CMakeLists.txt
index d2abab9..703ed97 100644 (file)
--- a/llvm/tools/llvm-diff/CMakeLists.txt
+++ b/llvm/tools/llvm-diff/CMakeLists.txt
@@ -6,10 +6,10 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_tool(llvm-diff
   llvm-diff.cpp
+  DiffConsumer.cpp
+  DiffLog.cpp
+  DifferenceEngine.cpp
 
   DEPENDS
   intrinsics_gen
   )
-
-add_subdirectory(lib)
-target_link_libraries(llvm-diff PRIVATE LLVMDiff)

diff --git a/llvm/tools/llvm-diff/lib/DiffConsumer.cpp b/llvm/tools/llvm-diff/DiffConsumer.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DiffConsumer.cpp
rename to llvm/tools/llvm-diff/DiffConsumer.cpp

diff --git a/llvm/tools/llvm-diff/lib/DiffConsumer.h b/llvm/tools/llvm-diff/DiffConsumer.h
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DiffConsumer.h
rename to llvm/tools/llvm-diff/DiffConsumer.h

diff --git a/llvm/tools/llvm-diff/lib/DiffLog.cpp b/llvm/tools/llvm-diff/DiffLog.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DiffLog.cpp
rename to llvm/tools/llvm-diff/DiffLog.cpp

diff --git a/llvm/tools/llvm-diff/lib/DiffLog.h b/llvm/tools/llvm-diff/DiffLog.h
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DiffLog.h
rename to llvm/tools/llvm-diff/DiffLog.h

diff --git a/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp b/llvm/tools/llvm-diff/DifferenceEngine.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
rename to llvm/tools/llvm-diff/DifferenceEngine.cpp

diff --git a/llvm/tools/llvm-diff/lib/DifferenceEngine.h b/llvm/tools/llvm-diff/DifferenceEngine.h
similarity index 100%
rename from llvm/tools/llvm-diff/lib/DifferenceEngine.h
rename to llvm/tools/llvm-diff/DifferenceEngine.h

diff --git a/llvm/tools/llvm-diff/lib/CMakeLists.txt b/llvm/tools/llvm-diff/lib/CMakeLists.txt
deleted file mode 100644 (file)
index 270c3d7..0000000
--- a/llvm/tools/llvm-diff/lib/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-    Core
-    Support
-    )
-
-add_llvm_library(LLVMDiff
-  STATIC
-  DiffConsumer.cpp
-  DiffConsumer.h
-  DifferenceEngine.cpp
-  DifferenceEngine.h
-  DiffLog.cpp
-  DiffLog.h
-  )

diff --git a/llvm/tools/llvm-diff/llvm-diff.cpp b/llvm/tools/llvm-diff/llvm-diff.cpp
index d9d19f3..8a11179 100644 (file)
--- a/llvm/tools/llvm-diff/llvm-diff.cpp
+++ b/llvm/tools/llvm-diff/llvm-diff.cpp
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lib/DiffLog.h"
-#include "lib/DifferenceEngine.h"
+#include "DiffLog.h"
+#include "DifferenceEngine.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"