[llvm] ec51370 - Revert "[llvm-diff] Create libLLVMDiff library"

[Matt Morehouse via llvm-commits]

Author: Matt Morehouse
Date: 2021-08-05T11:10:58-07:00
New Revision: ec5137029bf267bf3b6a52f035cf02ddc1932539

URL: https://github.com/llvm/llvm-project/commit/ec5137029bf267bf3b6a52f035cf02ddc1932539
DIFF: https://github.com/llvm/llvm-project/commit/ec5137029bf267bf3b6a52f035cf02ddc1932539.diff

LOG: Revert "[llvm-diff] Create libLLVMDiff library"

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

Added: 
    llvm/tools/llvm-diff/DiffConsumer.cpp
    llvm/tools/llvm-diff/DiffConsumer.h
    llvm/tools/llvm-diff/DiffLog.cpp
    llvm/tools/llvm-diff/DiffLog.h
    llvm/tools/llvm-diff/DifferenceEngine.cpp
    llvm/tools/llvm-diff/DifferenceEngine.h

Modified: 
    llvm/tools/llvm-diff/CMakeLists.txt
    llvm/tools/llvm-diff/llvm-diff.cpp

Removed: 
    llvm/tools/llvm-diff/lib/CMakeLists.txt
    llvm/tools/llvm-diff/lib/DiffConsumer.cpp
    llvm/tools/llvm-diff/lib/DiffConsumer.h
    llvm/tools/llvm-diff/lib/DiffLog.cpp
    llvm/tools/llvm-diff/lib/DiffLog.h
    llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
    llvm/tools/llvm-diff/lib/DifferenceEngine.h


################################################################################
diff  --git a/llvm/tools/llvm-
diff /CMakeLists.txt b/llvm/tools/llvm-
diff /CMakeLists.txt
index d2abab9719d9a..703ed97cb0b01 100644
--- 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
index 270c3d79480a7..0000000000000
--- 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 d9d19f35ffee8..8a11179e741ec 100644
--- 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"