PR 6937

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

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

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

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