From c5cb844243e6f18fe7bda3688e1c918f4c7e21be Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Mon, 14 Apr 2008 19:58:48 +0000
Subject: [PATCH] 	* configure.in: Link with the PIC version of libiberty
 on 	Linux/MIPS hosts. 	* configure: Regenerate.

---
 bfd/ChangeLog    |  6 ++++++
 bfd/configure    | 18 ++++--------------
 bfd/configure.in | 18 ++++--------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9614a83d821..5726af5ee36 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.in: Link with the PIC version of libiberty on
+	Linux/MIPS hosts.
+	* configure: Regenerate.
+
 2008-04-14  Edmar Wienskoski  <edmar@freescale.com>
 
 	* archures.c: Add bfd_mach_ppc_e500mc.
diff --git a/bfd/configure b/bfd/configure
index ab6c3e7401a..a3eeaa5ea64 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -18909,20 +18909,10 @@ case "${host}" in
 *-*-linux*)
   # We borrow WIN32LIBADD so that the shared libbfd 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
+  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
+  if test -n "$x"; then
+    WIN32LIBADD="-L../libiberty/pic -liberty"
+  fi
   ;;
 esac
 
diff --git a/bfd/configure.in b/bfd/configure.in
index 99ea58482a7..947f79d6aad 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -492,22 +492,12 @@ case "${host}" in
 *-*-linux*)
   # We borrow WIN32LIBADD so that the shared libbfd 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'`
+  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
+  if test -n "$x"; then
+    WIN32LIBADD="-L../libiberty/pic -liberty"
+  fi
   ;;
 esac
 AC_SUBST(WIN32LDFLAGS)
-- 
2.30.2