2000-01-07 David O'Brien <obrien@BSDi.com>

	* emultempl/elf32.em: Only perform Linux ld hints processing when
	targeting Linux.

Approved by:  Nick Clifton <nickc@redhat.com>
              Message-Id: <200101040127.RAA15127@elmo.cygnus.com>

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ceecb81fb7e0d8ed0c1b9316a2d60563d47e078b..e47805e3ca29dd9db8dabc2423374c415835a717 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-07  David O'Brien  <obrien@BSDi.com>
+
+       * emultempl/elf32.em: Only perform Linux ld hints processing when
+       targeting Linux.
+
 2001-01-07  Philip Blundell  <philb@gnu.org>
 
        * ld.texinfo (Bug Reporting): Update email address for reports.

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index e03da1b6159cb44fde71e4f2943c5fc224e547fa..492953d924b74ce6a6d9387b6189f7f8ebc6d292 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -425,11 +425,13 @@ EOF
 if [ "x${host}" = "x${target}" ] ; then
   case " ${EMULATION_LIBPATH} " in
   *" ${EMULATION_NAME} "*)
-cat >>e${EMULATION_NAME}.c <<EOF
+    case ${target} in
+      *-*-linux-gnu*)
+       cat >>e${EMULATION_NAME}.c <<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
-   only meaningful on Linux, but we check it on other systems anyhow.  */
+   only meaningful on Linux.  */
 
 static boolean gld${EMULATION_NAME}_check_ld_so_conf
   PARAMS ((const char *, int));
@@ -509,7 +511,9 @@ gld${EMULATION_NAME}_check_ld_so_conf (name, force)
 }
 
 EOF
-  ;;
+       # Linux
+       ;;
+    esac
   esac
 fi
 cat >>e${EMULATION_NAME}.c <<EOF
@@ -695,10 +699,15 @@ EOF
 if [ "x${host}" = "x${target}" ] ; then
   case " ${EMULATION_LIBPATH} " in
   *" ${EMULATION_NAME} "*)
-cat >>e${EMULATION_NAME}.c <<EOF
+    case ${target} in
+      *-*-linux-gnu*)
+       cat >>e${EMULATION_NAME}.c <<EOF
          if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
            break;
 EOF
+       # Linux
+        ;;
+    esac
   ;;
   esac
 fi