From c6f07c423d0adf0b96c8690bb893ebad534b753b Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <peter@pcc.me.uk>
Date: Sat, 13 May 2017 22:06:46 +0000
Subject: [PATCH] Move lib/LibDriver -> lib/ToolDrivers/llvm-lib. NFCI.

This reorganisation prevents us from cluttering up the top-level lib directory
with more driver libraries such as llvm-dlltool (see D29892).

llvm-svn: 302995
---
 lld/COFF/Driver.cpp                                               | 2 +-
 llvm/include/llvm/{LibDriver => ToolDrivers/llvm-lib}/LibDriver.h | 6 +++---
 llvm/lib/CMakeLists.txt                                           | 2 +-
 llvm/lib/LLVMBuild.txt                                            | 2 +-
 llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/CMakeLists.txt       | 0
 llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/LLVMBuild.txt        | 0
 llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/LibDriver.cpp        | 2 +-
 llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/Options.td           | 0
 llvm/tools/llvm-ar/llvm-ar.cpp                                    | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename llvm/include/llvm/{LibDriver => ToolDrivers/llvm-lib}/LibDriver.h (79%)
 rename llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/CMakeLists.txt (100%)
 rename llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/LLVMBuild.txt (100%)
 rename llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/LibDriver.cpp (99%)
 rename llvm/lib/{LibDriver => ToolDrivers/llvm-lib}/Options.td (100%)

diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index 5a15b5b..4c0ea44 100644
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -18,7 +18,6 @@
 #include "lld/Driver/Driver.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringSwitch.h"
-#include "llvm/LibDriver/LibDriver.h"
 #include "llvm/Object/ArchiveWriter.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
@@ -29,6 +28,7 @@
 #include "llvm/Support/TarWriter.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/ToolDrivers/llvm-lib/LibDriver.h"
 #include <algorithm>
 #include <memory>
 
diff --git a/llvm/include/llvm/LibDriver/LibDriver.h b/llvm/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
similarity index 79%
rename from llvm/include/llvm/LibDriver/LibDriver.h
rename to llvm/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
index 95feb60..a4806ac 100644
--- a/llvm/include/llvm/LibDriver/LibDriver.h
+++ b/llvm/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
@@ -1,4 +1,4 @@
-//===- llvm/LibDriver/LibDriver.h - lib.exe-compatible driver ---*- C++ -*-===//
+//===- llvm-lib/LibDriver.h - lib.exe-compatible driver ---------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBDRIVER_LIBDRIVER_H
-#define LLVM_LIBDRIVER_LIBDRIVER_H
+#ifndef LLVM_TOOLDRIVERS_LLVM_LIB_LIBDRIVER_H
+#define LLVM_TOOLDRIVERS_LLVM_LIB_LIBDRIVER_H
 
 namespace llvm {
 template <typename T> class ArrayRef;
diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
index 7654954..73fc2b3 100644
--- a/llvm/lib/CMakeLists.txt
+++ b/llvm/lib/CMakeLists.txt
@@ -21,5 +21,5 @@ add_subdirectory(LineEditor)
 add_subdirectory(ProfileData)
 add_subdirectory(Fuzzer)
 add_subdirectory(Passes)
-add_subdirectory(LibDriver)
+add_subdirectory(ToolDrivers)
 add_subdirectory(XRay)
diff --git a/llvm/lib/LLVMBuild.txt b/llvm/lib/LLVMBuild.txt
index 684b378..89ddd0f 100644
--- a/llvm/lib/LLVMBuild.txt
+++ b/llvm/lib/LLVMBuild.txt
@@ -24,7 +24,6 @@ subdirectories =
  DebugInfo
  Demangle
  ExecutionEngine
- LibDriver
  LineEditor
  Linker
  IR
@@ -39,6 +38,7 @@ subdirectories =
  Support
  TableGen
  Target
+ ToolDrivers
  Transforms
 
 [component_0]
diff --git a/llvm/lib/LibDriver/CMakeLists.txt b/llvm/lib/ToolDrivers/llvm-lib/CMakeLists.txt
similarity index 100%
rename from llvm/lib/LibDriver/CMakeLists.txt
rename to llvm/lib/ToolDrivers/llvm-lib/CMakeLists.txt
diff --git a/llvm/lib/LibDriver/LLVMBuild.txt b/llvm/lib/ToolDrivers/llvm-lib/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/LibDriver/LLVMBuild.txt
rename to llvm/lib/ToolDrivers/llvm-lib/LLVMBuild.txt
diff --git a/llvm/lib/LibDriver/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
similarity index 99%
rename from llvm/lib/LibDriver/LibDriver.cpp
rename to llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
index c50629d..3bae382 100644
--- a/llvm/lib/LibDriver/LibDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/LibDriver/LibDriver.h"
+#include "llvm/ToolDrivers/llvm-lib/LibDriver.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Object/ArchiveWriter.h"
 #include "llvm/Option/Arg.h"
diff --git a/llvm/lib/LibDriver/Options.td b/llvm/lib/ToolDrivers/llvm-lib/Options.td
similarity index 100%
rename from llvm/lib/LibDriver/Options.td
rename to llvm/lib/ToolDrivers/llvm-lib/Options.td
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 1519464..3de2604 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -16,7 +16,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
-#include "llvm/LibDriver/LibDriver.h"
+#include "llvm/ToolDrivers/llvm-lib/LibDriver.h"
 #include "llvm/Object/Archive.h"
 #include "llvm/Object/ArchiveWriter.h"
 #include "llvm/Object/MachO.h"
-- 
2.7.4