From c340d04279f046b543066dbc8f36452602d7fd52 Mon Sep 17 00:00:00 2001
From: Jose Flavio Aguilar Paulino <jflavio@br.ibm.com>
Date: Thu, 20 Sep 2007 11:11:37 -0600
Subject: [PATCH] [PPC32] Make get_func_addr() a no-op function. [PPC64] Add
 .../lib64 library directory when targeting ppc64.

---
 configure                 |  7 +++++++
 configure.in              |  6 ++++++
 src/ppc32/get_func_addr.c | 15 +++------------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index c120ccf7..3b14cda4 100755
--- a/configure
+++ b/configure
@@ -20858,6 +20858,13 @@ else
 fi
 
 
+if test x$target_arch = xppc64; then
+        libdir='${exec_prefix}/lib64'
+        { echo "$as_me:$LINENO: PowerPC64 detected, lib will be installed ${libdir}" >&5
+echo "$as_me: PowerPC64 detected, lib will be installed ${libdir}" >&6;};
+
+fi
+
 if test x$target_arch != x$build_arch; then
   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
 fi
diff --git a/configure.in b/configure.in
index 775a6f81..a1790698 100644
--- a/configure.in
+++ b/configure.in
@@ -95,6 +95,12 @@ AM_CONDITIONAL(ARCH_PPC64, test x$target_arch = xppc64)
 AM_CONDITIONAL(OS_LINUX, expr x$target_os : xlinux >/dev/null)
 AM_CONDITIONAL(OS_HPUX, expr x$target_os : xhpux >/dev/null)
 
+if test x$target_arch = xppc64; then
+        libdir='${exec_prefix}/lib64'
+        AC_MSG_NOTICE([PowerPC64 detected, lib will be installed ${libdir}]);
+        AC_SUBST([libdir])
+fi
+
 if test x$target_arch != x$build_arch; then
   CPPFLAGS="${CPPFLAGS} -DUNW_REMOTE_ONLY"
 fi
diff --git a/src/ppc32/get_func_addr.c b/src/ppc32/get_func_addr.c
index a9c828dc..14797c9b 100644
--- a/src/ppc32/get_func_addr.c
+++ b/src/ppc32/get_func_addr.c
@@ -28,18 +28,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #include "unwind_i.h"
 
 int
-tdep_get_func_addr (unw_addr_space_t as, unw_word_t addr,
-		    unw_word_t *entry_point)
+tdep_get_func_addr (unw_addr_space_t as, unw_word_t symbol_val_addr,
+		    unw_word_t *real_func_addr)
 {
-  unw_accessors_t *a;
-  int ret;
-
-  a = unw_get_accessors (as);
-  /* Entry-point is stored in the 1st word of the function descriptor.
-     In case that changes in the future, we'd have to update the line
-     below and read the word at addr + offset: */
-  ret = (*a->access_mem) (as, addr, entry_point, 0, NULL);
-  if (ret < 0)
-    return ret;
+  *real_func_addr = symbol_val_addr;
   return 0;
 }