diff options
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. */ |