diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-23 04:12:06 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-23 04:12:06 +0000 |
| commit | 37d4621bd4a912b6a032bc21906f7032e602cbf2 (patch) | |
| tree | 6e6f3dad18baebc5f90abdcbbf4a8ba242555627 /gnu/usr.bin/binutils/bfd/elflink.h | |
| parent | fb7c7a778840ea235dd0bb550cfd2e2ac8ccb37c (diff) | |
Merge to Cygnus 961112 + add some support (not ready) for shared libs
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/elflink.h')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/elflink.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/usr.bin/binutils/bfd/elflink.h b/gnu/usr.bin/binutils/bfd/elflink.h index 6326121dcd7..dcc5827db30 100644 --- a/gnu/usr.bin/binutils/bfd/elflink.h +++ b/gnu/usr.bin/binutils/bfd/elflink.h @@ -827,9 +827,8 @@ elf_link_add_object_symbols (abfd, info) new_flag = ELF_LINK_HASH_REF_DYNAMIC; else new_flag = ELF_LINK_HASH_DEF_DYNAMIC; - if ((old_flags & new_flag) != 0 - || (old_flags & (ELF_LINK_HASH_DEF_REGULAR - | ELF_LINK_HASH_REF_REGULAR)) != 0 + if ((old_flags & (ELF_LINK_HASH_DEF_REGULAR + | ELF_LINK_HASH_REF_REGULAR)) != 0 || (h->weakdef != NULL && (old_flags & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_DYNAMIC)) != 0)) |