diff options
| author | Jim Wilson <wilson@cygnus.com> | 1998-05-12 20:07:09 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1998-05-12 13:07:09 -0700 |
| commit | b706d7f20d438d0cda4790a798d98d5cb74290f9 (patch) | |
| tree | 589e330a92aea6f0b71afcd0ebdf79afda508023 /gcc | |
| parent | 4117a96b0138514a300f79c3deb1b4145ea03e2a (diff) | |
| download | gcc-b706d7f20d438d0cda4790a798d98d5cb74290f9.zip gcc-b706d7f20d438d0cda4790a798d98d5cb74290f9.tar.gz gcc-b706d7f20d438d0cda4790a798d98d5cb74290f9.tar.bz2 | |
Fix aix --with-gnu-ld build failure reported by Brendan.
* collect2.c (main): Ignore do_collecting when COLLECT_EXPORT_LIST.
From-SVN: r19704
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/collect2.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5b40273..21e0b89 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Tue May 12 20:05:57 1998 Jim Wilson <wilson@cygnus.com> + + * collect2.c (main): Ignore do_collecting when COLLECT_EXPORT_LIST. + Wed May 13 03:23:45 1998 J"orn Rennecke <amylaar@cygnus.co.uk> * reload1.c (gen_reload): Create REG_EQUIV notes. diff --git a/gcc/collect2.c b/gcc/collect2.c index 0cba7ef..d51a457 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1428,7 +1428,11 @@ main (argc, argv) /* 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) + if (rflag +#ifndef COLLECT_EXPORT_LIST + || ! do_collecting +#endif + ) { #ifdef COLLECT_EXPORT_LIST /* But make sure we delete the export file we may have created. */ |