From ee19c9c0190d69c2791b673994aaa701483bcb4e Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 20 Feb 1998 20:42:37 +0000 Subject: [PATCH] collect2.c (main): Still handle !do_collecting for non-AIX targets. * collect2.c (main): Still handle !do_collecting for non-AIX targets. Bring over from mainline sources. From-SVN: r18153 --- gcc/ChangeLog | 4 ++++ gcc/collect2.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 47104fa2b630..a58d83ab0bf7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +1998-02-20 Jason Merrill + + * collect2.c (main): Still handle !do_collecting for non-AIX targets. + Thu Feb 19 22:36:53 1998 Andrey Slepuhin David Edelsohn diff --git a/gcc/collect2.c b/gcc/collect2.c index 7fd5350d4464..6cc04d4bc3ce 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1511,20 +1511,21 @@ 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. */ if (rflag || ! do_collecting) { +#ifdef COLLECT_EXPORT_LIST /* But make sure we delete the export file we may have created. */ if (export_file != 0 && export_file[0]) maybe_unlink (export_file); if (import_file != 0 && import_file[0]) maybe_unlink (import_file); +#endif return 0; } -#endif /* Examine the namelist with nm and search it for static constructors and destructors to call. -- 2.47.2