Remove code that is already in llvm for some time.

3 files changed, 1 insertions, 63 deletions

diff --git a/Makefile.in b/Makefile.in
index ffdbf6fd..0b613d12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -368,7 +368,7 @@ RUNTIME_LIBS := $(CFG_GCC_POST_LIB_FLAGS)
 ######################################################################
 
 RUSTLLVM_LIB_CS := $(addprefix rustllvm/, \
-                     MachOObjectFile.cpp Object.cpp Passes.cpp)
+                     MachOObjectFile.cpp Passes.cpp)
 
 RUSTLLVM_OBJS_CS := $(addprefix rustllvm/, RustWrapper.cpp)
 
diff --git a/src/rustllvm/Object.cpp b/src/rustllvm/Object.cpp
deleted file mode 100644
index 603b23c7..00000000
--- a/src/rustllvm/Object.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//===- Object.cpp - C bindings to the object file library--------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the C bindings to the file-format-independent object
-// library.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Object/ObjectFile.h"
-#include "llvm-c/Object.h"
-
-using namespace llvm;
-using namespace object;
-
-LLVMObjectFileRef LLVMCreateObjectFile(LLVMMemoryBufferRef MemBuf) {
-  return wrap(ObjectFile::createObjectFile(unwrap(MemBuf)));
-}
-
-void LLVMDisposeObjectFile(LLVMObjectFileRef ObjectFile) {
-  delete unwrap(ObjectFile);
-}
-
-LLVMSectionIteratorRef LLVMGetSections(LLVMObjectFileRef ObjectFile) {
-  ObjectFile::section_iterator SI = unwrap(ObjectFile)->begin_sections();
-  return wrap(new ObjectFile::section_iterator(SI));
-}
-
-void LLVMDisposeSectionIterator(LLVMSectionIteratorRef SI) {
-  delete unwrap(SI);
-}
-
-LLVMBool LLVMIsSectionIteratorAtEnd(LLVMObjectFileRef ObjectFile,
-                                LLVMSectionIteratorRef SI) {
-  return (*unwrap(SI) == unwrap(ObjectFile)->end_sections()) ? 1 : 0;
-}
-
-void LLVMMoveToNextSection(LLVMSectionIteratorRef SI) {
-  // We can't use unwrap() here because the argument to ++ must be an lvalue.
-  ++*reinterpret_cast<ObjectFile::section_iterator*>(SI);
-}
-
-const char *LLVMGetSectionName(LLVMSectionIteratorRef SI) {
-  return (*unwrap(SI))->getName().data();
-}
-
-uint64_t LLVMGetSectionSize(LLVMSectionIteratorRef SI) {
-  return (*unwrap(SI))->getSize();
-}
-
-const char *LLVMGetSectionContents(LLVMSectionIteratorRef SI) {
-  return (*unwrap(SI))->getContents().data();
-}
-
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index aa17184c..ac9b48cd 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -29,9 +29,6 @@ extern "C" const char *LLVMRustGetLastError(void) {
   return LLVMRustError;
 }
 
-LLVMOpaqueObjectFile* (*RustHackToFetchObjectO)(LLVMOpaqueMemoryBuffer*)
-  = LLVMCreateObjectFile;
-
 extern "C" void LLVMAddBasicAliasAnalysisPass(LLVMPassManagerRef PM);
 
 void (*RustHackToFetchPassesO)(LLVMPassManagerRef PM) =