From bd3f26069840d2743e150004ab98cc3f0c969f08 Mon Sep 17 00:00:00 2001
From: Jim Ingham <jingham@apple.com>
Date: Tue, 8 Mar 2011 01:54:01 +0000
Subject: [PATCH] I didn't notice there was already an
 ObjectFile::GetEntryPoint.  Move that over to GetEntryPointAddress 'cause
 that's more consistent with other functions in ObjectFile, do the mutatis
 mutandi and also in the ELF case I return a section offset address rather
 than a bare load address.

llvm-svn: 127205
---
 lldb/include/lldb/Symbol/ObjectFile.h                | 11 -----------
 lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp |  9 ---------
 lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h   |  3 ---
 3 files changed, 23 deletions(-)

diff --git a/lldb/include/lldb/Symbol/ObjectFile.h b/lldb/include/lldb/Symbol/ObjectFile.h
index 70e889e3572f..5631bfc35ddf 100644
--- a/lldb/include/lldb/Symbol/ObjectFile.h
+++ b/lldb/include/lldb/Symbol/ObjectFile.h
@@ -175,17 +175,6 @@ public:
     virtual bool
     IsExecutable () const = 0;
 
-    //------------------------------------------------------------------
-    /// Returns the virtual address of the entry point for this object 
-    /// file.
-    ///
-    /// @return
-    ///     The virtual address of the entry point or an invalid address
-    ///     if an entry point is not defined.
-    //------------------------------------------------------------------
-    virtual lldb_private::Address
-    GetEntryPoint () const { return Address(); }
-    
     //------------------------------------------------------------------
     /// Returns the offset into a file at which this object resides.
     ///
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 546dc7840d26..03541b4faf4c 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -158,15 +158,6 @@ ObjectFileELF::IsExecutable() const
     return m_header.e_entry != 0;
 }
 
-Address
-ObjectFileELF::GetEntryPoint() const
-{
-    if (m_header.e_entry)
-        return Address(NULL, m_header.e_entry);
-    else
-        return Address();
-}
-
 ByteOrder
 ObjectFileELF::GetByteOrder() const
 {
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
index 2b78da5436b7..ebfde8965a5e 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
@@ -89,9 +89,6 @@ public:
     virtual bool
     IsExecutable () const;
 
-    virtual lldb_private::Address
-    GetEntryPoint() const;
-
     virtual size_t
     GetAddressByteSize() const;