OSDN Git Service

* ltmain.sh: Use $pic_object as $non_pic_object if
authordje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 8 Sep 2004 15:43:46 +0000 (15:43 +0000)
committerdje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 8 Sep 2004 15:43:46 +0000 (15:43 +0000)
        $non_pic_object=none.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87191 138bc75d-0d04-0410-961f-82ee72b054a4

ChangeLog
ltmain.sh

index 99d11dd..e376663 100644 (file)
--- 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.
index c1ef997..90925cb 100644 (file)
--- 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.