From: Jason Merrill <jason@yorick.cygnus.com>
Date: Fri, 20 Feb 1998 12:28:16 +0000 (+0000)
Subject: * collect2.c (main): Still handle !do_collecting for non-AIX targets.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2d731c4e9a2477f0262064fa194928c33e42f6b;p=gcc.git

* collect2.c (main): Still handle !do_collecting for non-AIX targets.

From-SVN: r18139
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5678ba3861..f83f87a5680 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+1998-02-20  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* collect2.c (main): Still handle !do_collecting for non-AIX targets.
+
 Fri Feb 20 10:39:47 1998  Michael Tiemann  <michael@impact.tiemann.org>
 
 	* ginclude/va-mips.h (va_arg): Remove trailing space after '\'
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 456716c29a7..79e59b5be1d 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1536,7 +1536,7 @@ main (argc, argv)
   /* On AIX we do this later.  */
 #ifndef COLLECT_EXPORT_LIST
   do_tlink (ld1_argv, object_lst); 
-#else
+#endif
 
   /* If -r or they will be run via some other method, do not build the
      constructor or destructor list, just return now.  */
@@ -1549,7 +1549,6 @@ main (argc, argv)
 	maybe_unlink (import_file);
       return 0;
     }
-#endif
 
   /* Examine the namelist with nm and search it for static constructors
      and destructors to call.