[mips] Marked up instructions added in MIPS-IV and tested that IAS for -mcpu=mips...

[oota-llvm.git] / lib / Object / ELFObjectFile.cpp

diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp
index 2736bc42f2ea246eedc2bfb7f9e899a600410dab..a2c4df2007f7600dde8d69f5baf07877f867497b 100644 (file)
--- a/lib/Object/ELFObjectFile.cpp
+++ b/lib/Object/ELFObjectFile.cpp
@@ -17,51 +17,60 @@
 namespace llvm {
 using namespace object;
 
-ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj) {
+ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj,
+                                                      bool BufferOwned) {
   std::pair<unsigned char, unsigned char> Ident = getElfArchType(Obj);
   std::size_t MaxAlignment =
     1ULL << countTrailingZeros(uintptr_t(Obj->getBufferStart()));
 
   error_code EC;
-  OwningPtr<ObjectFile> R;
+  std::unique_ptr<ObjectFile> R;
   if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2LSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 4)
-      R.reset(new ELFObjectFile<ELFType<support::little, 4, false> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::little, 4, false> >(
+          Obj, EC, BufferOwned));
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(new ELFObjectFile<ELFType<support::little, 2, false> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::little, 2, false> >(
+          Obj, EC, BufferOwned));
     else
       llvm_unreachable("Invalid alignment for ELF file!");
   else if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2MSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 4)
-      R.reset(new ELFObjectFile<ELFType<support::big, 4, false> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 4, false> >(Obj, EC,
+                                                                  BufferOwned));
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(new ELFObjectFile<ELFType<support::big, 2, false> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 2, false> >(Obj, EC,
+                                                                  BufferOwned));
     else
       llvm_unreachable("Invalid alignment for ELF file!");
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2MSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
-      R.reset(new ELFObjectFile<ELFType<support::big, 8, true> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 8, true> >(Obj, EC,
+                                                                 BufferOwned));
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(new ELFObjectFile<ELFType<support::big, 2, true> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 2, true> >(Obj, EC,
+                                                                 BufferOwned));
     else
       llvm_unreachable("Invalid alignment for ELF file!");
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2LSB) {
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
-      R.reset(new ELFObjectFile<ELFType<support::little, 8, true> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::little, 8, true> >(
+          Obj, EC, BufferOwned));
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(new ELFObjectFile<ELFType<support::little, 2, true> >(Obj, EC));
+      R.reset(new ELFObjectFile<ELFType<support::little, 2, true> >(
+          Obj, EC, BufferOwned));
     else
       llvm_unreachable("Invalid alignment for ELF file!");
   }
@@ -70,7 +79,7 @@ ErrorOr<ObjectFile *> ObjectFile::createELFObjectFile(MemoryBuffer *Obj) {
 
   if (EC)
     return EC;
-  return R.take();
+  return R.release();
 }
 
 } // end namespace llvm