From: Nick Clifton <nickc@redhat.com>
Date: Wed, 22 Oct 2008 14:45:34 +0000 (+0000)
Subject:         PR 6937
X-Git-Tag: sid-snapshot-20081201~314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4267b19fc71aba8dafa490b9d71b90ef013f5cd9;p=external%2Fbinutils.git

    PR 6937
        * configure.in (SHARED_LIBADD): Revert previous change.
        Add a comment explaining why.
        (SHARED_DEPENDENCIES): Revert previous change.
        * configure: Regenerate.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 3b83f4b..b2d8a36 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Nick Clifton  <nickc@redhat.com>
+
+	PR 6937
+	* configure.in (SHARED_LIBADD): Revert previous change.
+	Add a comment explaining why.
+	(SHARED_DEPENDENCIES): Revert previous change.
+	* configure: Regenerate.
+
 2008-10-10  Nick Clifton  <nickc@redhat.com>
 
 	PR 6937
diff --git a/opcodes/configure b/opcodes/configure
index 33c246b..90291a9 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -12436,10 +12436,14 @@ if test "$enable_shared" = "yes"; then
           SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl"
 	  ;;
 	*)
-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a"
+	  # It is tempting to include libiberty here as well, but
+	  # that library is only built as a static version.
+	  # Including it here would insert text relocations into
+	  # the opcodes library, which is undesirable.
+          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so"
 	  ;;
       esac
-      SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a"
+      SHARED_DEPENDENCIES="../bfd/libbfd.la"
       ;;
   esac
 fi
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 061bb71..1efeb3f 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -118,10 +118,14 @@ if test "$enable_shared" = "yes"; then
           SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl"
 	  ;;
 	*)
-          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a"
+	  # It is tempting to include libiberty here as well, but
+	  # that library is only built as a static version.
+	  # Including it here would insert text relocations into
+	  # the opcodes library, which is undesirable.
+          SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so"
 	  ;;
       esac
-      SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a"
+      SHARED_DEPENDENCIES="../bfd/libbfd.la"
       ;;
   esac
 fi