From 8a67f12a3d2ad1f49320c7eb509d8d83b892de53 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 6 Mar 2014 03:42:23 +0000 Subject: [PATCH] [Layering] Sink Linker.h into a Linker subdirectory to make it consistent with every other sub-library header in LLVM. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203065 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/LTO/LTOCodeGenerator.h | 2 +- include/llvm/{ => Linker}/Linker.h | 6 +++--- lib/LTO/LTOCodeGenerator.cpp | 2 +- lib/Linker/LinkModules.cpp | 2 +- tools/bugpoint/BugDriver.cpp | 2 +- tools/bugpoint/Miscompilation.cpp | 2 +- tools/llvm-link/llvm-link.cpp | 2 +- unittests/Linker/LinkModulesTest.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename include/llvm/{ => Linker}/Linker.h (93%) diff --git a/include/llvm/LTO/LTOCodeGenerator.h b/include/llvm/LTO/LTOCodeGenerator.h index 4836a51a7e7..ee2b2088914 100644 --- a/include/llvm/LTO/LTOCodeGenerator.h +++ b/include/llvm/LTO/LTOCodeGenerator.h @@ -39,7 +39,7 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringMap.h" -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/Target/TargetOptions.h" #include #include diff --git a/include/llvm/Linker.h b/include/llvm/Linker/Linker.h similarity index 93% rename from include/llvm/Linker.h rename to include/llvm/Linker/Linker.h index 67f6fc12c59..42b2cb37b30 100644 --- a/include/llvm/Linker.h +++ b/include/llvm/Linker/Linker.h @@ -1,4 +1,4 @@ -//===- llvm/Linker.h - Module Linker Interface ------------------*- C++ -*-===// +//===- Linker.h - Module Linker Interface -----------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LINKER_H -#define LLVM_LINKER_H +#ifndef LLVM_LINKER_LINKER_H +#define LLVM_LINKER_LINKER_H #include "llvm/ADT/SmallPtrSet.h" #include diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index d6ca41b8df8..4e28c328ad8 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -29,7 +29,7 @@ #include "llvm/IR/Verifier.h" #include "llvm/InitializePasses.h" #include "llvm/LTO/LTOModule.h" -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/SubtargetFeature.h" diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index a0ce497dd47..c6476ce7b84 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm-c/Linker.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/SetVector.h" diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp index a5436ba4852..c23a7912c75 100644 --- a/tools/bugpoint/BugDriver.cpp +++ b/tools/bugpoint/BugDriver.cpp @@ -17,7 +17,7 @@ #include "ToolRunner.h" #include "llvm/IR/Module.h" #include "llvm/IRReader/IRReader.h" -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileUtilities.h" diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp index 069a32af0fd..8aebe5ea839 100644 --- a/tools/bugpoint/Miscompilation.cpp +++ b/tools/bugpoint/Miscompilation.cpp @@ -21,7 +21,7 @@ #include "llvm/IR/Instructions.h" #include "llvm/IR/Module.h" #include "llvm/IR/Verifier.h" -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileUtilities.h" diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index f1b32de04b8..14491482870 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" diff --git a/unittests/Linker/LinkModulesTest.cpp b/unittests/Linker/LinkModulesTest.cpp index 06c00a05040..ef3772d3a73 100644 --- a/unittests/Linker/LinkModulesTest.cpp +++ b/unittests/Linker/LinkModulesTest.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Linker.h" +#include "llvm/Linker/Linker.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/Function.h" -- 2.34.1