From b7699b78893faf3036bca1b83591ad23cbc5c5c3 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 16 Jul 2011 21:46:54 -0700
Subject: [PATCH] Remove Object.h from rustllvm

This file appears to be upstream now
---
 mk/rustllvm.mk                       |  3 +-
 src/rustllvm/include/llvm-c/Object.h | 77 ----------------------------
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 src/rustllvm/include/llvm-c/Object.h

diff --git a/mk/rustllvm.mk b/mk/rustllvm.mk
index bcae15679c4..046cdb289bd 100644
--- a/mk/rustllvm.mk
+++ b/mk/rustllvm.mk
@@ -7,7 +7,6 @@ RUSTLLVM_LIB_CS := $(addprefix rustllvm/, \
 
 RUSTLLVM_OBJS_CS := $(addprefix rustllvm/, RustWrapper.cpp)
 
-RUSTLLVM_HDR := rustllvm/include/llvm-c/Object.h
 RUSTLLVM_DEF := rustllvm/rustllvm$(CFG_DEF_SUFFIX)
 
 RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
@@ -28,7 +27,7 @@ rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
 # Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
 # it has no -whole-archive.
 rustllvm/$(CFG_RUSTLLVM): rustllvm/rustllvmbits.a $(RUSTLLVM_OBJS_OBJS) \
-                          $(MKFILES) $(RUSTLLVM_HDR) $(RUSTLLVM_DEF)
+                          $(MKFILES) $(RUSTLLVM_DEF)
 	@$(call E, link: $@)
 	$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_OBJS_OBJS) \
 	  $(CFG_GCCISH_PRE_LIB_FLAGS) $(CFG_LLVM_LIBS) \
diff --git a/src/rustllvm/include/llvm-c/Object.h b/src/rustllvm/include/llvm-c/Object.h
deleted file mode 100644
index 6e72b594664..00000000000
--- a/src/rustllvm/include/llvm-c/Object.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*===-- llvm-c/Object.h - Object Lib C Iface --------------------*- C++ -*-===*/
-/*                                                                            */
-/*                     The LLVM Compiler Infrastructure                       */
-/*                                                                            */
-/* This file is distributed under the University of Illinois Open Source      */
-/* License. See LICENSE.TXT for details.                                      */
-/*                                                                            */
-/*===----------------------------------------------------------------------===*/
-/*                                                                            */
-/* This header declares the C interface to libLLVMObject.a, which             */
-/* implements object file reading and writing.                                */
-/*                                                                            */
-/* Many exotic languages can interoperate with C code but have a harder time  */
-/* with C++ due to name mangling. So in addition to C, this interface enables */
-/* tools written in such languages.                                           */
-/*                                                                            */
-/*===----------------------------------------------------------------------===*/
-
-#ifndef LLVM_C_OBJECT_H
-#define LLVM_C_OBJECT_H
-
-#include "llvm-c/Core.h"
-#include "llvm/Config/llvm-config.h"
-
-#ifdef __cplusplus
-#include "llvm/Object/ObjectFile.h"
-
-extern "C" {
-#endif
-
-
-typedef struct LLVMOpaqueObjectFile *LLVMObjectFileRef;
-
-typedef struct LLVMOpaqueSectionIterator *LLVMSectionIteratorRef;
-
-LLVMObjectFileRef LLVMCreateObjectFile(LLVMMemoryBufferRef MemBuf);
-void LLVMDisposeObjectFile(LLVMObjectFileRef ObjectFile);
-
-LLVMSectionIteratorRef LLVMGetSections(LLVMObjectFileRef ObjectFile);
-void LLVMDisposeSectionIterator(LLVMSectionIteratorRef SI);
-LLVMBool LLVMIsSectionIteratorAtEnd(LLVMObjectFileRef ObjectFile,
-                                LLVMSectionIteratorRef SI);
-void LLVMMoveToNextSection(LLVMSectionIteratorRef SI);
-const char *LLVMGetSectionName(LLVMSectionIteratorRef SI);
-uint64_t LLVMGetSectionSize(LLVMSectionIteratorRef SI);
-const char *LLVMGetSectionContents(LLVMSectionIteratorRef SI);
-
-
-#ifdef __cplusplus
-}
-
-namespace llvm {
-  namespace object {
-    inline ObjectFile *unwrap(LLVMObjectFileRef OF) {
-      return reinterpret_cast<ObjectFile*>(OF);
-    }
-
-    inline LLVMObjectFileRef wrap(const ObjectFile *OF) {
-      return reinterpret_cast<LLVMObjectFileRef>(const_cast<ObjectFile*>(OF));
-    }
-
-    inline ObjectFile::section_iterator *unwrap(LLVMSectionIteratorRef SI) {
-      return reinterpret_cast<ObjectFile::section_iterator*>(SI);
-    }
-
-    inline LLVMSectionIteratorRef
-    wrap(const ObjectFile::section_iterator *SI) {
-      return reinterpret_cast<LLVMSectionIteratorRef>
-        (const_cast<ObjectFile::section_iterator*>(SI));
-    }
-  }
-}
-
-#endif /* defined(__cplusplus) */
-
-#endif
-