summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>1999-10-12 21:16:52 +0000
committerDavid Edelsohn <dje@gcc.gnu.org>1999-10-12 17:16:52 -0400
commit5f04f321f2ad3157b9f57cc30a514dc0323b6361 (patch)
treec7cc6f0712a121cedb427c44e93b2f84868b0458
parentca47ce66e65dd913476ffc0349d547b47d32d9cb (diff)
downloadgcc-5f04f321f2ad3157b9f57cc30a514dc0323b6361.tar.gz
* collect2.c (main): Do preliminary link on AIX if rflag.
From-SVN: r29928
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/collect2.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ad31a5ecec6..18a6d0b1a5b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 12 17:09:38 1999 David Edelsohn <edelsohn@gnu.org>
+
+ * collect2.c (main): Do preliminary link on AIX if rflag.
+
Mon Oct 11 23:35:19 1999 Jeffrey A Law (law@cygnus.com)
Fri Sep 3 09:14:32 1999 Marc Espie <espie@tetto.liafa.jussieu.fr>
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 121ad392704..e5d6452e19c 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1515,7 +1515,7 @@ main (argc, argv)
/* On AIX we do this later. */
#ifndef COLLECT_EXPORT_LIST
- do_tlink (ld1_argv, object_lst);
+ do_tlink (ld1_argv, object_lst);
#endif
/* If -r or they will be run via some other method, do not build the
@@ -1527,6 +1527,9 @@ main (argc, argv)
)
{
#ifdef COLLECT_EXPORT_LIST
+ /* Do the link we avoided above if we are exiting. */
+ do_tlink (ld1_argv, object_lst);
+
/* But make sure we delete the export file we may have created. */
if (export_file != 0 && export_file[0])
maybe_unlink (export_file);