Index: llvm/trunk/include/llvm-c/Object.h =================================================================== --- llvm/trunk/include/llvm-c/Object.h +++ llvm/trunk/include/llvm-c/Object.h @@ -102,6 +102,22 @@ */ LLVMBinaryType LLVMBinaryGetType(LLVMBinaryRef BR); +/* + * For a Mach-O universal binary file, retrieves the object file corresponding + * to the given architecture if it is present as a slice. + * + * If NULL is returned, the \p ErrorMessage parameter is populated with the + * error's description. It is then the caller's responsibility to free this + * message by calling \c LLVMDisposeMessage. + * + * It is the responsiblity of the caller to free the returned object file by + * calling \c LLVMDisposeBinary. + */ +LLVMBinaryRef LLVMMachOUniversalBinaryCopyObjectForArch(LLVMBinaryRef BR, + const char *Arch, + size_t ArchLen, + char **ErrorMessage); + /** * Retrieve a copy of the section iterator for this object file. * Index: llvm/trunk/lib/Object/Object.cpp =================================================================== --- llvm/trunk/lib/Object/Object.cpp +++ llvm/trunk/lib/Object/Object.cpp @@ -15,6 +15,7 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/IR/LLVMContext.h" #include "llvm/Object/ObjectFile.h" +#include "llvm/Object/MachOUniversal.h" using namespace llvm; using namespace object; @@ -131,6 +132,20 @@ return BinaryTypeMapper::mapBinaryTypeToLLVMBinaryType(unwrap(BR)->getType()); } +LLVMBinaryRef LLVMMachOUniversalBinaryCopyObjectForArch(LLVMBinaryRef BR, + const char *Arch, + size_t ArchLen, + char **ErrorMessage) { + auto universal = cast(unwrap(BR)); + Expected> ObjOrErr( + universal->getObjectForArch({Arch, ArchLen})); + if (!ObjOrErr) { + *ErrorMessage = strdup(toString(ObjOrErr.takeError()).c_str()); + return nullptr; + } + return wrap(ObjOrErr.get().release()); +} + LLVMSectionIteratorRef LLVMObjectFileCopySectionIterator(LLVMBinaryRef BR) { auto OF = cast(unwrap(BR)); auto sections = OF->sections();