2006-02-08 H.J. Lu <hongjiu.lu@intel.com>

	PR ld/2290
	* NEWS: Updated for the Linux linker search order change.

	* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Call
	gld${EMULATION_NAME}_check_ld_so_conf before checking default
	search directories for DT_NEEDED entries.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2cb4fd08bcf0ee533c521c360d054600b5125d24..b525e77cdb6aafeb41b2d40f314d12bc368620a1 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/2290
+       * NEWS: Updated for the Linux linker search order change.
+
+       * emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Call
+       gld${EMULATION_NAME}_check_ld_so_conf before checking default
+       search directories for DT_NEEDED entries.
+
 2006-02-07  Paul Brook  <paul@codesourcery.com>
 
        * emultempl/armelf.em: Include elf/arm.h.

diff --git a/ld/NEWS b/ld/NEWS
index 23ccc9385de94b5d8dd763e7c5b2cdcd34728118..7ec8921d998d33a480130f7474c0fff6f3aebe39 100644 (file)
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,5 +1,8 @@
 -*- text -*-
 
+* Modify the Linux linker to seach /etc/ld.so.conf first before
+  checking default search directories for DT_NEEDED entries.
+
 * PE-COFF: Forward exports from DLL's can now be specified in .def files
   passed directly to ld.
 

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 703248a5ce4855e06f1166fcae0fa770b84996bf..048917f3b5a5140eb861f24df250426267e130a1 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -919,6 +919,18 @@ cat >>e${EMULATION_NAME}.c <<EOF
 
 EOF
 fi
+if [ "x${USE_LIBPATH}" = xyes ] ; then
+  case ${target} in
+    *-*-linux-* | *-*-k*bsd*-*)
+    # Linux
+      cat >>e${EMULATION_NAME}.c <<EOF
+         if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
+           break;
+
+EOF
+    ;;
+  esac
+fi
 cat >>e${EMULATION_NAME}.c <<EOF
          len = strlen (l->name);
          for (search = search_head; search != NULL; search = search->next)
@@ -937,17 +949,6 @@ cat >>e${EMULATION_NAME}.c <<EOF
          if (search != NULL)
            break;
 EOF
-if [ "x${USE_LIBPATH}" = xyes ] ; then
-  case ${target} in
-    *-*-linux-* | *-*-k*bsd*-*)
-      cat >>e${EMULATION_NAME}.c <<EOF
-         if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
-           break;
-EOF
-    # Linux
-    ;;
-  esac
-fi
 cat >>e${EMULATION_NAME}.c <<EOF
        }