[src/netbsd-1-4]: src/gnu/usr.bin/ld/ld Pull up revision 1.23 (requested by m...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9566060d04c0
branches:  netbsd-1-4
changeset: 471235:9566060d04c0
user:      he <he%NetBSD.org@localhost>
date:      Sun Jan 21 17:07:58 2001 +0000

description:
Pull up revision 1.23 (requested by mycroft):
  The options --whole-archive and --no-whole-archive should be
  position-dependent.  Make them actually behave that way.

diffstat:

 gnu/usr.bin/ld/ld/lib.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 645610a21e46 -r 9566060d04c0 gnu/usr.bin/ld/ld/lib.c
--- a/gnu/usr.bin/ld/ld/lib.c   Sun Jan 21 17:07:42 2001 +0000
+++ b/gnu/usr.bin/ld/ld/lib.c   Sun Jan 21 17:07:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lib.c,v 1.19.2.2 2000/01/15 17:16:11 he Exp $  */
+/*     $NetBSD: lib.c,v 1.19.2.3 2001/01/21 17:07:58 he Exp $  */
 
 /*
  *     - library routines
@@ -48,7 +48,7 @@
        register char  *name;
        register struct file_entry *subentry;
 
-       if (!(link_mode & FORCEARCHIVE) && !undefined_global_sym_count)
+       if (!(entry->flags & E_FORCE_ARCHIVE) && !undefined_global_sym_count)
                return;
 
        /* Examine its first member, which starts SARMAG bytes in.  */
@@ -240,7 +240,7 @@
                 */
 
                for (i = 0; (i < nsymdefs &&
-                                       ((link_mode & FORCEARCHIVE) ||
+                                       ((entry->flags & E_FORCE_ARCHIVE) ||
                                        undefined_global_sym_count ||
                                        common_defined_global_count)); i++) {
 
@@ -276,7 +276,7 @@
                         * archive members to be searched for definitions
                         * satisfying undefined shared object symbols.
                         */
-                       if (!(link_mode & FORCEARCHIVE) &&
+                       if (!(entry->flags & E_FORCE_ARCHIVE) &&
                                (!sp || sp->defined ||
                                        (!(sp->flags & GS_REFERENCED) &&
                                                !sp->sorefs)))
@@ -314,7 +314,7 @@
                         * load.
                         */
 
-                       if (!(link_mode & FORCEARCHIVE) &&
+                       if (!(entry->flags & E_FORCE_ARCHIVE) &&
                                        !subfile_wanted_p(subentry)) {
                                if (subentry->symbols)
                                        free(subentry->symbols);
@@ -377,7 +377,7 @@
        struct  file_entry *prev = 0;
        int     this_subfile_offset = SARMAG;
 
-       while ((link_mode & FORCEARCHIVE) ||
+       while ((entry->flags & E_FORCE_ARCHIVE) ||
                undefined_global_sym_count || common_defined_global_count) {
 
                int                     member_length;
@@ -394,7 +394,7 @@
                subentry->strings = (char *)malloc(subentry->string_size);
                read_entry_strings(fd, subentry);
 
-               if (!(link_mode & FORCEARCHIVE) &&
+               if (!(entry->flags & E_FORCE_ARCHIVE) &&
                    !subfile_wanted_p(subentry)) {
                        if (subentry->symbols)
                                free(subentry->symbols);