--- binutils/Makefile.def

+++ binutils/Makefile.def

@@ -356,6 +356,7 @@ dependencies = { module=all-ld; on=all-build-byacc; };

 dependencies = { module=all-ld; on=all-build-flex; };

 dependencies = { module=all-ld; on=all-intl; };

+dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; };

 dependencies = { module=configure-opcodes; on=configure-intl; };

 dependencies = { module=all-opcodes; on=all-bfd; };

 dependencies = { module=all-opcodes; on=all-libiberty; };

--- binutils/Makefile.in

+++ binutils/Makefile.in

@@ -43272,6 +43272,7 @@ all-libgui: maybe-all-tcl

 all-libgui: maybe-all-tk

 all-libgui: maybe-all-itcl

 configure-bfd: configure-libiberty

+configure-opcodes: configure-libiberty

 configure-stage1-bfd: configure-stage1-libiberty

 configure-stage2-bfd: configure-stage2-libiberty

--- binutils/opcodes/configure.in

+++ binutils/opcodes/configure.in

@@ -106,6 +106,26 @@ case "${host}" in

     WIN32LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"

   fi

   ;;

+*-*-linux*)

+  # We borrow WIN32LIBADD so that the shared libopcodes won't depend on

+  # libiberty.a.

+  case "${host}" in

+  mips*-*-linux*)

+    # Linux/MIPS uses PIC by default.

+    if test "$enable_shared" = "yes"; then

+      WIN32LIBADD="-L../libiberty -liberty"

+    fi

+    ;;

+  *)

+changequote(,)dnl

+    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`

+changequote([,])dnl

+    if test -n "$x"; then

+      WIN32LIBADD="-L../libiberty/pic -liberty"

+    fi

+  ;;

+  esac

+  ;;

 esac

 AC_SUBST(WIN32LDFLAGS)

 AC_SUBST(WIN32LIBADD)

--- binutils/opcodes/configure

+++ binutils/opcodes/configure

@@ -6477,6 +6477,24 @@ case "${host}" in

     WIN32LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"

   fi

   ;;

+*-*-linux*)

+  # We borrow WIN32LIBADD so that the shared libopcodes won't depend on

+  # libiberty.a.

+  case "${host}" in

+  mips*-*-linux*)

+    # Linux/MIPS uses PIC by default.

+    if test "$enable_shared" = "yes"; then

+      WIN32LIBADD="-L../libiberty -liberty"

+    fi

+    ;;

+  *)

+    x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`

+    if test -n "$x"; then

+      WIN32LIBADD="-L../libiberty/pic -liberty"

+    fi

+  ;;

+  esac

+  ;;

 esac