From b1a33c4a598d67a9b911bb3b45b379e36fb9396c Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 17 Nov 2010 00:43:43 +0000 Subject: Fix typo: Exectuable -> Executable git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119433 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index c2ab4a5..0ef730b 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -48,7 +48,7 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { case sys::Mach_O_Executable_FileType: case sys::Mach_O_FixedVirtualMemorySharedLib_FileType: case sys::Mach_O_Core_FileType: - case sys::Mach_O_PreloadExectuable_FileType: + case sys::Mach_O_PreloadExecutable_FileType: case sys::Mach_O_DynamicallyLinkedSharedLib_FileType: case sys::Mach_O_DynamicLinker_FileType: case sys::Mach_O_Bundle_FileType: -- cgit v1.1 From 1f6efa3996dd1929fbc129203ce5009b620e6969 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Mon, 29 Nov 2010 18:16:10 +0000 Subject: Merge System into Support. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120298 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 0ef730b..3ea39b3 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -14,7 +14,7 @@ #include "llvm/Object/ObjectFile.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/System/Path.h" +#include "llvm/Support/Path.h" using namespace llvm; using namespace object; -- cgit v1.1 From 333fb04506233255f10d8095c9e2de5e5f0fdc6f Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 9 Dec 2010 17:36:48 +0000 Subject: Support/MemoryBuffer: Replace all uses of std::string *ErrMsg with error_code &ec. And fix clients. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121379 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 3ea39b3..2a6e086 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -15,6 +15,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" +#include "llvm/Support/system_error.h" using namespace llvm; using namespace object; @@ -62,5 +63,6 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { } ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) { - return createObjectFile(MemoryBuffer::getFile(ObjectPath)); + error_code ec; + return createObjectFile(MemoryBuffer::getFile(ObjectPath, ec)); } -- cgit v1.1 From 3ff9563c3e391954b2e224afcf8b2b0fcc3888aa Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 16 Dec 2010 03:29:14 +0000 Subject: MemoryBuffer now return an error_code and returns a OwningPtr via an out parm. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121958 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 2a6e086..aa483f3 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Object/ObjectFile.h" +#include "llvm/ADT/OwningPtr.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" @@ -63,6 +64,8 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { } ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) { - error_code ec; - return createObjectFile(MemoryBuffer::getFile(ObjectPath, ec)); + OwningPtr File; + if (error_code ec = MemoryBuffer::getFile(ObjectPath, File)) + return NULL; + return createObjectFile(File.take()); } -- cgit v1.1 From a1ef8ef66075e28e020e5d2f408e0a9bae9eb9d3 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 20 Jan 2011 06:38:34 +0000 Subject: Object: Add COFF Support. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123895 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index aa483f3..01b129f 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -57,7 +57,7 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { case sys::Mach_O_DynamicallyLinkedSharedLibStub_FileType: return 0; case sys::COFF_FileType: - return 0; + return createCOFFObjectFile(Object); default: llvm_unreachable("Unknown Object File Type"); } -- cgit v1.1 From b84551a14f1c96942eb82408652e633543b0961e Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 20 Jan 2011 06:38:47 +0000 Subject: Object: Add ELF support. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123896 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/ObjectFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Object/ObjectFile.cpp') diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 01b129f..161ae3a 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -45,7 +45,7 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { case sys::ELF_Executable_FileType: case sys::ELF_SharedObject_FileType: case sys::ELF_Core_FileType: - return 0; + return createELFObjectFile(Object); case sys::Mach_O_Object_FileType: case sys::Mach_O_Executable_FileType: case sys::Mach_O_FixedVirtualMemorySharedLib_FileType: -- cgit v1.1