From a5244b7e43f790d781138a82c0f5a53ac23284c3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 16 May 2012 10:43:41 +0000
Subject: [PATCH] 	PR ld/14069 	* emultempl/elf32.em: Include *-*-gnu*
 targets in ld.so.conf 	support.

---
 ld/ChangeLog          | 6 ++++++
 ld/emultempl/elf32.em | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index eff6cf39823..d026c35d6a5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	PR ld/14069
+	* emultempl/elf32.em: Include *-*-gnu* targets in ld.so.conf
+	support.
+
 2012-05-15  James Murray <jsm@jsm-net.demon.co.uk>
 
 	* NEWS: Mention the support for S12X processors.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 880f054ff9a..aab1c6d8e64 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -72,7 +72,7 @@ EOF
 
 if [ "x${USE_LIBPATH}" = xyes ] ; then
   case ${target} in
-    *-*-linux-* | *-*-k*bsd*-*)
+    *-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
   fragment <<EOF
 #ifdef HAVE_GLOB
 #include <glob.h>
@@ -374,7 +374,7 @@ gld${EMULATION_NAME}_try_needed (struct dt_needed *needed,
 
 EOF
 case ${target} in
-  *-*-linux-* | *-*-k*bsd*-*)
+  *-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
     fragment <<EOF
 	  {
 	    struct bfd_link_needed_list *l;
@@ -620,7 +620,7 @@ EOF
     # FreeBSD
     ;;
 
-    *-*-linux-* | *-*-k*bsd*-*)
+    *-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
       fragment <<EOF
 /* For a native linker, check the file /etc/ld.so.conf for directories
    in which we may find shared libraries.  /etc/ld.so.conf is really
@@ -1310,7 +1310,7 @@ EOF
     # FreeBSD
     ;;
 
-    *-*-linux-* | *-*-k*bsd*-*)
+    *-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
     # Linux
       fragment <<EOF
 	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
-- 
2.30.2