summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeresa Johnson <tejohnson@google.com>2016-11-11 05:35:22 +0000
committerTeresa Johnson <tejohnson@google.com>2016-11-11 05:35:22 +0000
commit1e390897bafdb8fbeec855014a2dd625850ee583 (patch)
tree3dc70caa6e816ffc1e9791fd946f1a662d42b9a9
parentffc4e2420fd0ffe4444329f21420ee0c39f273a1 (diff)
downloadbcm5719-llvm-1e390897bafdb8fbeec855014a2dd625850ee583.tar.gz
bcm5719-llvm-1e390897bafdb8fbeec855014a2dd625850ee583.zip
Mirror the llvm changes that split Bitcode/ReaderWriter.h
The change in D26502 splits ReaderWriter.h, which contains the APIs into both the BitReader and BitWriter libraries, into BitcodeReader.h and BitcodeWriter.h. Change lld uses to the appropriate split header, removing it completely in one case where it wasn't needed. llvm-svn: 286568
-rw-r--r--lld/ELF/InputFiles.cpp2
-rw-r--r--lld/ELF/SymbolTable.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 3eb89097d69..87baa9d6a73 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -16,7 +16,7 @@
#include "SymbolTable.h"
#include "Symbols.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Bitcode/BitcodeReader.h"
#include "llvm/CodeGen/Analysis.h"
#include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/IR/LLVMContext.h"
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index d929a8fd014..838aed43d42 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -21,7 +21,6 @@
#include "Memory.h"
#include "SymbolListFile.h"
#include "Symbols.h"
-#include "llvm/Bitcode/ReaderWriter.h"
using namespace llvm;
using namespace llvm::object;
OpenPOWER on IntegriCloud