This commit was manufactured by cvs2svn to create tag 'drow_intercu-drow_intercu-merge-20040915

merge-20040915'.

Sprout from gdb_6_3-branch 2004-10-18 08:06:32 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'gdb_6_3-branch'.'
Cherrypick from master 2004-09-15 00:00:05 UTC Alan Modra <amodra@gmail.com> 'daily update':
    ChangeLog
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/aclocal.m4
    bfd/aout-target.h
    bfd/aout-tic30.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/bfd.c
    bfd/binary.c
    bfd/coff-rs6000.c
    bfd/coff64-rs6000.c
    bfd/coffcode.h
    bfd/config.bfd
    bfd/configure
    bfd/configure.in
    bfd/cpu-i386.c
    bfd/doc/ChangeLog
    bfd/doc/Makefile.am
    bfd/doc/Makefile.in
    bfd/dwarf2.c
    bfd/ecoff.c
    bfd/elf-bfd.h
    bfd/elf-eh-frame.c
    bfd/elf-hppa.h
    bfd/elf-m10300.c
    bfd/elf.c
    bfd/elf32-arm.h
    bfd/elf32-cris.c
    bfd/elf32-frv.c
    bfd/elf32-hppa.c
    bfd/elf32-i370.c
    bfd/elf32-i386.c
    bfd/elf32-m32r.c
    bfd/elf32-m68k.c
    bfd/elf32-ppc.c
    bfd/elf32-s390.c
    bfd/elf32-sh-symbian.c
    bfd/elf32-sh.c
    bfd/elf32-sh64.c
    bfd/elf32-sparc.c
    bfd/elf32-vax.c
    bfd/elf32-xstormy16.c
    bfd/elf32-xtensa.c
    bfd/elf64-alpha.c
    bfd/elf64-hppa.c
    bfd/elf64-mips.c
    bfd/elf64-ppc.c
    bfd/elf64-s390.c
    bfd/elf64-sh64.c
    bfd/elf64-sparc.c
    bfd/elf64-x86-64.c
    bfd/elfarm-nabi.c
    bfd/elflink.c
    bfd/elfxx-ia64.c
    bfd/elfxx-mips.c
    bfd/elfxx-target.h
    bfd/hash.c
    bfd/i386msdos.c
    bfd/ieee.c
    bfd/ihex.c
    bfd/libaout.h
    bfd/libbfd-in.h
    bfd/libbfd.h
    bfd/libecoff.h
    bfd/linker.c
    bfd/mach-o.c
    bfd/mmo.c
    bfd/nlm-target.h
    bfd/oasys.c
    bfd/opncls.c
    bfd/pe-i386.c
    bfd/pef.c
    bfd/pei-i386.c
    bfd/po/SRC-POTFILES.in
    bfd/po/bfd.pot
    bfd/ppcboot.c
    bfd/reloc.c
    bfd/simple.c
    bfd/som.c
    bfd/srec.c
    bfd/syms.c
    bfd/targets.c
    bfd/tekhex.c
    bfd/versados.c
    bfd/version.h
    bfd/vms.c
    bfd/xcoff-target.h
    bfd/xcofflink.c
    bfd/xsym.c
    bfd/xtensa-isa.c
    bfd/xtensa-modules.c
    config.guess
    config/ChangeLog
    config/gettext.m4
    configure
    configure.in
    gdb/ChangeLog
    gdb/MAINTAINERS
    gdb/Makefile.in
    gdb/ada-exp.y
    gdb/ada-lang.c
    gdb/ada-lang.h
    gdb/ada-lex.l
    gdb/ada-typeprint.c
    gdb/ada-valprint.c
    gdb/aix-thread.c
    gdb/alphanbsd-tdep.c
    gdb/amd64-nat.h
    gdb/amd64bsd-nat.c
    gdb/amd64fbsd-nat.c
    gdb/amd64nbsd-nat.c
    gdb/amd64obsd-nat.c
    gdb/breakpoint.c
    gdb/bsd-kvm.c
    gdb/config.in
    gdb/config/alpha/alpha-linux.mh
    gdb/config/arm/linux.mh
    gdb/config/djgpp/fnchange.lst
    gdb/config/frv/tm-frv.h
    gdb/config/i386/fbsd.mh
    gdb/config/i386/fbsd64.mh
    gdb/config/i386/linux.mh
    gdb/config/i386/linux64.mh
    gdb/config/i386/nbsd64.mh
    gdb/config/i386/nbsdaout.mh
    gdb/config/i386/nbsdelf.mh
    gdb/config/i386/nm-fbsd.h
    gdb/config/i386/nm-fbsd64.h
    gdb/config/i386/nm-i386.h
    gdb/config/i386/nm-linux.h
    gdb/config/i386/nm-nbsdaout.h
    gdb/config/i386/nm-obsd.h
    gdb/config/i386/obsd.mh
    gdb/config/i386/obsd64.mh
    gdb/config/i386/obsdaout.mh
    gdb/config/ia64/linux.mh
    gdb/config/ia64/nm-linux.h
    gdb/config/m68k/linux.mh
    gdb/config/m88k/obsd.mh
    gdb/config/mips/linux.mh
    gdb/config/nm-linux.h
    gdb/config/nm-lynx.h
    gdb/config/pa/hpux1020.mh
    gdb/config/pa/hpux11.mh
    gdb/config/pa/hpux11w.mh
    gdb/config/pa/linux.mh
    gdb/config/powerpc/linux.mh
    gdb/config/powerpc/nbsd.mh
    gdb/config/powerpc/ppc64-linux.mh
    gdb/config/s390/s390.mh
    gdb/config/sparc/fbsd.mh
    gdb/config/sparc/linux.mh
    gdb/config/sparc/linux64.mh
    gdb/config/sparc/nbsd64.mh
    gdb/config/sparc/nbsd64.mt
    gdb/config/sparc/nbsdaout.mh
    gdb/config/sparc/nbsdelf.mh
    gdb/config/sparc/obsd.mt
    gdb/config/sparc/obsd64.mt
    gdb/config/vax/nbsdaout.mh
    gdb/config/vax/nbsdelf.mh
    gdb/config/vax/obsd.mh
    gdb/configure
    gdb/configure.in
    gdb/configure.tgt
    gdb/corelow.c
    gdb/cris-tdep.c
    gdb/defs.h
    gdb/doc/ChangeLog
    gdb/doc/gdb.texinfo
    gdb/doc/gdbint.texinfo
    gdb/doc/stabs.texinfo
    gdb/dwarf2read.c
    gdb/event-top.c
    gdb/exec.c
    gdb/fbsd-proc.c
    gdb/fork-child.c
    gdb/frv-tdep.c
    gdb/gdb_indent.sh
    gdb/gdb_thread_db.h
    gdb/gdbcmd.h
    gdb/gdbserver/ChangeLog
    gdb/gdbserver/Makefile.in
    gdb/gdbserver/configure
    gdb/gdbserver/configure.in
    gdb/gdbserver/linux-i386-low.c
    gdb/gdbserver/linux-low.c
    gdb/gdbserver/linux-x86-64-low.c
    gdb/gdbserver/proc-service.c
    gdb/gdbserver/remote-utils.c
    gdb/gdbserver/thread-db.c
    gdb/gdbtypes.h
    gdb/gnu-nat.c
    gdb/go32-nat.c
    gdb/hppa-tdep.c
    gdb/hppah-nat.c
    gdb/hpux-thread.c
    gdb/i386-nat.c
    gdb/i386-tdep.c
    gdb/i386bsd-nat.c
    gdb/i386fbsd-nat.c
    gdb/i386gnu-nat.c
    gdb/i386nbsd-nat.c
    gdb/ia64-linux-nat.c
    gdb/inf-child.c
    gdb/inf-ptrace.c
    gdb/infcall.c
    gdb/infptrace.c
    gdb/infrun.c
    gdb/inftarg.c
    gdb/infttrace.c
    gdb/jv-exp.y
    gdb/language.c
    gdb/lin-lwp.c
    gdb/linux-nat.c
    gdb/linux-proc.c
    gdb/m32r-tdep.c
    gdb/m88kbsd-nat.c
    gdb/maint.c
    gdb/minsyms.c
    gdb/mips-tdep.c
    gdb/monitor.c
    gdb/nto-procfs.c
    gdb/objfiles.c
    gdb/ppc-bdm.c
    gdb/procfs.c
    gdb/regcache.c
    gdb/remote-e7000.c
    gdb/remote-m32r-sdi.c
    gdb/remote-mips.c
    gdb/remote-rdi.c
    gdb/remote-rdp.c
    gdb/remote-sds.c
    gdb/remote-sim.c
    gdb/remote-st.c
    gdb/remote-vx.c
    gdb/remote.c
    gdb/rs6000-nat.c
    gdb/rs6000-tdep.c
    gdb/sh-tdep.c
    gdb/sh-tdep.h
    gdb/sol-thread.c
    gdb/solib-sunos.c
    gdb/source.c
    gdb/sparc-linux-tdep.c
    gdb/sparc-nat.c
    gdb/sparc-nat.h
    gdb/sparc64-linux-tdep.c
    gdb/sparc64nbsd-nat.c
    gdb/sparc64nbsd-tdep.c
    gdb/sparc64obsd-tdep.c
    gdb/sparcnbsd-nat.c
    gdb/symfile.c
    gdb/symtab.c
    gdb/target.c
    gdb/target.h
    gdb/testsuite/ChangeLog
    gdb/testsuite/Makefile.in
    gdb/testsuite/config/gdbserver.exp
    gdb/testsuite/configure
    gdb/testsuite/configure.in
    gdb/testsuite/gdb.asm/asm-source.exp
    gdb/testsuite/gdb.base/bigcore.c
    gdb/testsuite/gdb.base/bigcore.exp
    gdb/testsuite/gdb.base/constvars.exp
    gdb/testsuite/gdb.base/overlays.exp
    gdb/testsuite/gdb.base/sigstep.exp
    gdb/testsuite/gdb.base/volatile.exp
    gdb/testsuite/gdb.mi/gdb701.c
    gdb/testsuite/gdb.threads/bp_in_thread.exp
    gdb/testsuite/gdb.threads/pthread_cond_wait.exp
    gdb/testsuite/gdb.threads/watchthreads.exp
    gdb/thread-db.c
    gdb/top.c
    gdb/tui/tui-wingeneral.c
    gdb/utils.c
    gdb/uw-thread.c
    gdb/v850ice.c
    gdb/valarith.c
    gdb/vaxbsd-nat.c
    gdb/version.in
    gdb/win32-nat.c
    gdb/wince.c
    gdb/xstormy16-tdep.c
    include/ChangeLog
    include/bfdlink.h
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/common.h
    include/elf/dwarf2.h
    include/elf/x86-64.h
    include/elf/xtensa.h
    include/opcode/ChangeLog
    include/opcode/arm.h
    include/opcode/crx.h
    include/xtensa-config.h
    include/xtensa-isa-internal.h
    include/xtensa-isa.h
    install-sh
    intl/ChangeLog
    intl/Makefile.in
    intl/acconfig.h
    intl/aclocal.m4
    intl/bindtextdom.c
    intl/cat-compat.c
    intl/config.in
    intl/configure
    intl/configure.in
    intl/dcgettext.c
    intl/dgettext.c
    intl/explodename.c
    intl/finddomain.c
    intl/gettext.c
    intl/gettext.h
    intl/gettextP.h
    intl/hash-string.h
    intl/intl-compat.c
    intl/intlh.inst.in
    intl/l10nflist.c
    intl/libgettext.h
    intl/libintl.glibc
    intl/linux-msg.sed
    intl/loadinfo.h
    intl/loadmsgcat.c
    intl/localealias.c
    intl/po2tbl.sed.in
    intl/textdomain.c
    intl/xopen-msg.sed
    ltcf-c.sh
    ltcf-cxx.sh
    ltconfig
    mmalloc/COPYING.LIB
    mmalloc/ChangeLog
    mmalloc/MAINTAINERS
    mmalloc/Makefile.in
    mmalloc/TODO
    mmalloc/acinclude.m4
    mmalloc/aclocal.m4
    mmalloc/attach.c
    mmalloc/configure
    mmalloc/configure.in
    mmalloc/detach.c
    mmalloc/keys.c
    mmalloc/mcalloc.c
    mmalloc/mfree.c
    mmalloc/mm.c
    mmalloc/mmalloc.c
    mmalloc/mmalloc.h
    mmalloc/mmalloc.texi
    mmalloc/mmap-sup.c
    mmalloc/mmcheck.c
    mmalloc/mmemalign.c
    mmalloc/mmprivate.h
    mmalloc/mmstats.c
    mmalloc/mmtrace.awk
    mmalloc/mmtrace.c
    mmalloc/mrealloc.c
    mmalloc/mvalloc.c
    mmalloc/sbrk-sup.c
    opcodes/ChangeLog
    opcodes/Makefile.am
    opcodes/Makefile.in
    opcodes/aclocal.m4
    opcodes/arm-dis.c
    opcodes/arm-opc.h
    opcodes/configure
    opcodes/crx-dis.c
    opcodes/crx-opc.c
    opcodes/pdp11-dis.c
    opcodes/po/POTFILES.in
    opcodes/po/opcodes.pot
    opcodes/ppc-opc.c
    opcodes/xtensa-dis.c
    sim/common/ChangeLog
    sim/common/cgen-defs.h
    sim/mips/ChangeLog
    sim/mips/m16.igen
    sim/ppc/ChangeLog
    sim/ppc/config.in
    sim/ppc/configure
    sim/ppc/configure.in
    sim/ppc/emul_netbsd.c
Cherrypick from cygnus 1999-05-03 07:29:11 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    ylwrap
Delete:
    config/codeset.m4
    config/gcc-lib-path.m4
    config/gettext-sister.m4
    config/glibc21.m4
    config/iconv.m4
    config/intdiv0.m4
    config/inttypes-pri.m4
    config/inttypes.m4
    config/inttypes_h.m4
    config/lcmessage.m4
    config/lib-ld.m4
    config/lib-link.m4
    config/lib-prefix.m4
    config/mh-x86omitfp
    config/nls.m4
    config/po.m4
    config/stdint_h.m4
    config/uintmax_t.m4
    config/ulonglong.m4
    config/warnings.m4
    gdb/config/m32r/linux.mh
    gdb/config/m32r/linux.mt
    gdb/config/m32r/nm-linux.h
    gdb/fbsd-nat.c
    gdb/fbsd-nat.h
    gdb/i386bsd-nat.h
    gdb/m32r-linux-nat.c
    gdb/m32r-linux-tdep.c
    gdb/m32r-tdep.h
    gdb/testsuite/gdb.asm/m32r-linux.inc
    gdb/testsuite/gdb.dwarf2/Makefile.in
    gdb/testsuite/gdb.dwarf2/dw2-basic.S
    gdb/testsuite/gdb.dwarf2/dw2-basic.exp
    gdb/testsuite/gdb.dwarf2/dw2-intercu.S
    gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
    gdb/testsuite/gdb.dwarf2/file1.txt
    gdb/testsuite/gdb.dwarf2/main.c
    gdb/testsuite/gdb.java/jprint.exp
    gdb/testsuite/gdb.java/jprint.java
    gdb/testsuite/gdb.threads/watchthreads.c

1 files changed, 66 insertions, 76 deletions

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index ff26613..5565e49 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -104,6 +104,40 @@ struct elf_link_hash_entry
      not visible outside this DSO.  */
   long dynindx;
 
+  /* String table index in .dynstr if this is a dynamic symbol.  */
+  unsigned long dynstr_index;
+
+  /* Hash value of the name computed using the ELF hash function.  */
+  unsigned long elf_hash_value;
+
+  /* If this is a weak defined symbol from a dynamic object, this
+     field points to a defined symbol with the same value, if there is
+     one.  Otherwise it is NULL.  */
+  struct elf_link_hash_entry *weakdef;
+
+  /* Version information.  */
+  union
+  {
+    /* This field is used for a symbol which is not defined in a
+       regular object.  It points to the version information read in
+       from the dynamic object.  */
+    Elf_Internal_Verdef *verdef;
+    /* This field is used for a symbol which is defined in a regular
+       object.  It is set up in size_dynamic_sections.  It points to
+       the version information we should write out for this symbol.  */
+    struct bfd_elf_version_tree *vertree;
+  } verinfo;
+
+  /* Virtual table entry use information.  This array is nominally of size
+     size/sizeof(target_void_pointer), though we have to be able to assume
+     and track a size while the symbol is still undefined.  It is indexed
+     via offset/sizeof(target_void_pointer).  */
+  size_t vtable_entries_size;
+  bfd_boolean *vtable_entries_used;
+
+  /* Virtual table derivation info.  */
+  struct elf_link_hash_entry *vtable_parent;
+
   /* If this symbol requires an entry in the global offset table, the
      processor specific backend uses this field to track usage and
      final offset.  Two schemes are supported:  The first assumes that
@@ -128,89 +162,47 @@ struct elf_link_hash_entry
   bfd_size_type size;
 
   /* Symbol type (STT_NOTYPE, STT_OBJECT, etc.).  */
-  unsigned int type : 8;
+  char type;
 
   /* Symbol st_other value, symbol visibility.  */
-  unsigned int other : 8;
+  unsigned char other;
 
+  /* Some flags; legal values follow.  */
+  unsigned short elf_link_hash_flags;
   /* Symbol is referenced by a non-shared object.  */
-  unsigned int ref_regular : 1;
+#define ELF_LINK_HASH_REF_REGULAR 01
   /* Symbol is defined by a non-shared object.  */
-  unsigned int def_regular : 1;
+#define ELF_LINK_HASH_DEF_REGULAR 02
   /* Symbol is referenced by a shared object.  */
-  unsigned int ref_dynamic : 1;
+#define ELF_LINK_HASH_REF_DYNAMIC 04
   /* Symbol is defined by a shared object.  */
-  unsigned int def_dynamic : 1;
+#define ELF_LINK_HASH_DEF_DYNAMIC 010
   /* Symbol has a non-weak reference from a non-shared object.  */
-  unsigned int ref_regular_nonweak : 1;
+#define ELF_LINK_HASH_REF_REGULAR_NONWEAK 020
   /* Dynamic symbol has been adjustd.  */
-  unsigned int dynamic_adjusted : 1;
+#define ELF_LINK_HASH_DYNAMIC_ADJUSTED 040
   /* Symbol needs a copy reloc.  */
-  unsigned int needs_copy : 1;
+#define ELF_LINK_HASH_NEEDS_COPY 0100
   /* Symbol needs a procedure linkage table entry.  */
-  unsigned int needs_plt : 1;
+#define ELF_LINK_HASH_NEEDS_PLT 0200
   /* Symbol appears in a non-ELF input file.  */
-  unsigned int non_elf : 1;
+#define ELF_LINK_NON_ELF 0400
   /* Symbol should be marked as hidden in the version information.  */
-  unsigned int hidden : 1;
+#define ELF_LINK_HIDDEN 01000
   /* Symbol was forced to local scope due to a version script file.  */
-  unsigned int forced_local : 1;
+#define ELF_LINK_FORCED_LOCAL 02000
   /* Symbol was marked during garbage collection.  */
-  unsigned int mark : 1;
+#define ELF_LINK_HASH_MARK 04000
   /* Symbol is referenced by a non-GOT/non-PLT relocation.  This is
      not currently set by all the backends.  */
-  unsigned int non_got_ref : 1;
-  /* Symbol has a definition in a shared object.
-     FIXME: There is no real need for this field if def_dynamic is never
-     cleared and all places that test def_dynamic also test def_regular.  */
-  unsigned int dynamic_def : 1;
+#define ELF_LINK_NON_GOT_REF 010000
+  /* Symbol has a definition in a shared object.  */
+#define ELF_LINK_DYNAMIC_DEF 020000
   /* Symbol is weak in all shared objects.  */
-  unsigned int dynamic_weak : 1;
+#define ELF_LINK_DYNAMIC_WEAK 040000
   /* Symbol is referenced with a relocation where C/C++ pointer equality
      matters.  */
-  unsigned int pointer_equality_needed : 1;
-
-  /* String table index in .dynstr if this is a dynamic symbol.  */
-  unsigned long dynstr_index;
-
-  union
-  {
-    /* If this is a weak defined symbol from a dynamic object, this
-       field points to a defined symbol with the same value, if there is
-       one.  Otherwise it is NULL.  */
-    struct elf_link_hash_entry *weakdef;
-
-    /* Hash value of the name computed using the ELF hash function.
-       Used part way through size_dynamic_sections, after we've finished
-       with weakdefs.  */
-    unsigned long elf_hash_value;
-  } u;
-
-  /* Version information.  */
-  union
-  {
-    /* This field is used for a symbol which is not defined in a
-       regular object.  It points to the version information read in
-       from the dynamic object.  */
-    Elf_Internal_Verdef *verdef;
-    /* This field is used for a symbol which is defined in a regular
-       object.  It is set up in size_dynamic_sections.  It points to
-       the version information we should write out for this symbol.  */
-    struct bfd_elf_version_tree *vertree;
-  } verinfo;
-
-  struct
-  {
-    /* Virtual table entry use information.  This array is nominally of size
-       size/sizeof(target_void_pointer), though we have to be able to assume
-       and track a size while the symbol is still undefined.  It is indexed
-       via offset/sizeof(target_void_pointer).  */
-    size_t size;
-    bfd_boolean *used;
-
-    /* Virtual table derivation info.  */
-    struct elf_link_hash_entry *parent;
-  } *vtable;
+#define ELF_LINK_POINTER_EQUALITY_NEEDED 0100000
 };
 
 /* Will references to this symbol always reference the symbol
@@ -229,8 +221,8 @@ struct elf_link_hash_entry
 /* Common symbols that are turned into definitions don't have the
    DEF_REGULAR flag set, so they might appear to be undefined.  */
 #define ELF_COMMON_DEF_P(H) \
-  (!(H)->def_regular							\
-   && !(H)->def_dynamic							\
+  (((H)->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0		\
+   && ((H)->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0	\
    && (H)->root.type == bfd_link_hash_defined)
 
 /* Records local symbols to be emitted in the dynamic symbol table.  */
@@ -286,10 +278,9 @@ struct cie
 
 struct eh_cie_fde
 {
-  /* For FDEs, this points to the CIE used.  */
-  struct eh_cie_fde *cie_inf;
-  unsigned int size;
   unsigned int offset;
+  unsigned int size;
+  asection *sec;
   unsigned int new_offset;
   unsigned char fde_encoding;
   unsigned char lsda_encoding;
@@ -298,8 +289,6 @@ struct eh_cie_fde
   unsigned int removed : 1;
   unsigned int make_relative : 1;
   unsigned int make_lsda_relative : 1;
-  unsigned int need_relative : 1;
-  unsigned int need_lsda_relative : 1;
   unsigned int per_encoding_relative : 1;
 };
 
@@ -320,15 +309,14 @@ struct eh_frame_hdr_info
 {
   struct cie last_cie;
   asection *last_cie_sec;
-  struct eh_cie_fde *last_cie_inf;
   asection *hdr_sec;
+  unsigned int last_cie_offset;
   unsigned int fde_count, array_count;
   struct eh_frame_array_ent *array;
   /* TRUE if .eh_frame_hdr should contain the sorted search table.
      We build it if we successfully read all .eh_frame input sections
      and recognize them.  */
   bfd_boolean table;
-  bfd_boolean offsets_adjusted;
 };
 
 /* ELF linker hash table.  */
@@ -1260,7 +1248,7 @@ struct elf_obj_tdata
   unsigned int cverrefs;
 
   /* Segment flags for the PT_GNU_STACK segment.  */
-  unsigned int stack_flags;
+  unsigned int stack_flags;  
 
   /* Should the PT_GNU_RELRO segment be emitted?  */
   bfd_boolean relro;
@@ -1532,7 +1520,7 @@ extern bfd_boolean _bfd_elf_discard_section_eh_frame
 extern bfd_boolean _bfd_elf_discard_section_eh_frame_hdr
   (bfd *, struct bfd_link_info *);
 extern bfd_vma _bfd_elf_eh_frame_section_offset
-  (bfd *, struct bfd_link_info *, asection *, bfd_vma);
+  (bfd *, asection *, bfd_vma);
 extern bfd_boolean _bfd_elf_write_section_eh_frame
   (bfd *, struct bfd_link_info *, asection *, bfd_byte *);
 extern bfd_boolean _bfd_elf_write_section_eh_frame_hdr
@@ -1783,8 +1771,10 @@ extern bfd_boolean _sh_elf_set_mach_from_flags
    about initializing any .plt and .got entries in relocate_section.  */
 #define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, SHARED, H) \
   ((DYN)								\
-   && ((SHARED) || !(H)->forced_local)					\
-   && ((H)->dynindx != -1 || (H)->forced_local))
+   && ((SHARED)								\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)	\
+   && ((H)->dynindx != -1						\
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
 
 /* This macro is to avoid lots of duplicated code in the body
    of xxx_relocate_section() in the various elfxx-xxxx.c files.  */