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 3b83f4bec3362eac733a309502eba08f91510fca..b2d8a366045db2293342515e43c87171b78cd1cb 100644 (file)
--- 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 33c246b22c8e1f2b213449ac422950a5fdaf10f0..90291a9423c4bc22dfbaf2cf23cf38e9bc0c0994 100755 (executable)
--- 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 061bb716a2aa8a90575430c149b458e1a2bfa582..1efeb3f95e857fc19ac78930826d2e160316125f 100644 (file)
--- 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