diff --git a/ChangeLog b/ChangeLog
index 99d11dd2b237ff1b5cb1fd134490706ce822c522..e37666374a8e15cad1707038c3c2f876e90c89c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-08  David Edelsohn  <edelsohn@gnu.org>
+
+	* ltmain.sh: Use $pic_object as $non_pic_object if
+	$non_pic_object=none.
+
 2004-09-07  Paolo Bonzini  <bonzini@gnu.org>
 
 	* missing: Import latest version from master repository.
diff --git a/ltmain.sh b/ltmain.sh
index c1ef9974d0e8e0a1c866e6a6bdeb615b9ec6ec50..90925cb2f6d4c78ce6e699f737ac5e4d9d20f27e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1041,6 +1041,11 @@ EOF
                   if test -z "$pic_object" || test "$pic_object" = none ; then
                     arg="$non_pic_object"
                   fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
                 fi
               else
                 # Only an error if not doing a dry-run.
@@ -1466,6 +1471,11 @@ EOF
             if test -z "$pic_object" || test "$pic_object" = none ; then
               arg="$non_pic_object"
             fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
           fi
         else
           # Only an error if not doing a dry-run.