diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-02-20 12:28:16 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-02-20 07:28:16 -0500 |
| commit | c2d731c4e9a2477f0262064fa194928c33e42f6b (patch) | |
| tree | 896e6d01fcfb2ee1db9d313eee564853ba00ef46 /gcc | |
| parent | 96abf60005cd606eb0b5ff016136465cfd1652a0 (diff) | |
| download | gcc-c2d731c4e9a2477f0262064fa194928c33e42f6b.zip gcc-c2d731c4e9a2477f0262064fa194928c33e42f6b.tar.gz gcc-c2d731c4e9a2477f0262064fa194928c33e42f6b.tar.bz2 | |
* collect2.c (main): Still handle !do_collecting for non-AIX targets.
From-SVN: r18139
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/collect2.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b5678ba..f83f87a 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 456716c..79e59b5 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. |