Fix -Wmisleading-indentation warning in top.c

[deliverable/binutils-gdb.git] / bfd / cofflink.c

diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index beff5cd3cb90d6f565500eace057ff758691cc71..0ca8649dff894a33857bb0159c7499d10522fc01 100644 (file)
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -1,5 +1,5 @@
 /* COFF specific linker code.
 /* COFF specific linker code.

-   Copyright (C) 1994-2018 Free Software Foundation, Inc.
+   Copyright (C) 1994-2019 Free Software Foundation, Inc.

    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -221,7 +221,7 @@ coff_link_check_archive_element (bfd *abfd,
     return TRUE;
   *pneeded = TRUE;
 
     return TRUE;
   *pneeded = TRUE;
 

-  return coff_link_add_object_symbols (abfd, info);
+  return bfd_link_add_symbols (abfd, info);

 }
 
 /* Add all the symbols from an object file to the hash table.  */
 }
 
 /* Add all the symbols from an object file to the hash table.  */


@@ -310,7 +310,9 @@ coff_link_add_symbols (bfd *abfd,
            case COFF_SYMBOL_GLOBAL:
              flags = BSF_EXPORT | BSF_GLOBAL;
              section = coff_section_from_bfd_index (abfd, sym.n_scnum);
            case COFF_SYMBOL_GLOBAL:
              flags = BSF_EXPORT | BSF_GLOBAL;
              section = coff_section_from_bfd_index (abfd, sym.n_scnum);

-             if (! obj_pe (abfd))
+             if (discarded_section (section))
+               section = bfd_und_section_ptr;
+             else if (! obj_pe (abfd))

                value -= section->vma;
              break;
 
                value -= section->vma;
              break;
 


@@ -327,6 +329,8 @@ coff_link_add_symbols (bfd *abfd,
            case COFF_SYMBOL_PE_SECTION:
              flags = BSF_SECTION_SYM | BSF_GLOBAL;
              section = coff_section_from_bfd_index (abfd, sym.n_scnum);
            case COFF_SYMBOL_PE_SECTION:
              flags = BSF_SECTION_SYM | BSF_GLOBAL;
              section = coff_section_from_bfd_index (abfd, sym.n_scnum);

+             if (discarded_section (section))
+               section = bfd_und_section_ptr;

              break;
            }
 
              break;
            }
 


@@ -349,7 +353,7 @@ coff_link_add_symbols (bfd *abfd,
                      && (*sym_hash)->root.type != bfd_link_hash_undefined
                      && (*sym_hash)->root.type != bfd_link_hash_undefweak)
                    _bfd_error_handler
                      && (*sym_hash)->root.type != bfd_link_hash_undefined
                      && (*sym_hash)->root.type != bfd_link_hash_undefweak)
                    _bfd_error_handler

-                     (_("Warning: symbol `%s' is both section and non-section"),
+                     (_("warning: symbol `%s' is both section and non-section"),

                       name);
 
                  addit = FALSE;
                       name);
 
                  addit = FALSE;


@@ -451,8 +455,8 @@ coff_link_add_symbols (bfd *abfd,
                                   || BTYPE (sym.n_type) == T_NULL)))
                        _bfd_error_handler
                          /* xgettext: c-format */
                                   || BTYPE (sym.n_type) == T_NULL)))
                        _bfd_error_handler
                          /* xgettext: c-format */

-                         (_("Warning: type of symbol `%s' changed"
-                            " from %d to %d in %B"),
+                         (_("warning: type of symbol `%s' changed"
+                            " from %d to %d in %pB"),

                           name, (*sym_hash)->type, sym.n_type, abfd);
 
                      /* We don't want to change from a meaningful
                           name, (*sym_hash)->type, sym.n_type, abfd);
 
                      /* We don't want to change from a meaningful


@@ -898,7 +902,7 @@ _bfd_coff_final_link (bfd *abfd,
                                        bfd_asymbol_name(sym), FALSE, FALSE)
                       == NULL))
                  || (((flaginfo.info->discard == discard_sec_merge
                                        bfd_asymbol_name(sym), FALSE, FALSE)
                       == NULL))
                  || (((flaginfo.info->discard == discard_sec_merge

-                       && (bfd_get_section (sym)->flags & SEC_MERGE)
+                       && (bfd_asymbol_section (sym)->flags & SEC_MERGE)

                        && ! bfd_link_relocatable (flaginfo.info))
                       || flaginfo.info->discard == discard_l)
                      && bfd_is_local_label_name (sub, bfd_asymbol_name(sym))))
                        && ! bfd_link_relocatable (flaginfo.info))
                       || flaginfo.info->discard == discard_l)
                      && bfd_is_local_label_name (sub, bfd_asymbol_name(sym))))


@@ -1182,9 +1186,9 @@ _bfd_coff_final_link (bfd *abfd,
 
   _bfd_stringtab_free (flaginfo.strtab);
 
 
   _bfd_stringtab_free (flaginfo.strtab);
 

-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+  /* Setting symcount to 0 will cause write_object_contents to

      not try to write out the symbols.  */
      not try to write out the symbols.  */

-  bfd_get_symcount (abfd) = 0;
+  abfd->symcount = 0;

 
   return TRUE;
 
 
   return TRUE;
 


@@ -1839,7 +1843,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
 
            case C_FCN:
              if (obj_pe (input_bfd)
 
            case C_FCN:
              if (obj_pe (input_bfd)

-                 && strcmp (isym.n_name, ".bf") != 0
+                 && memcmp (isym.n_name, ".bf", sizeof ".bf") != 0

                  && isym.n_scnum > 0)
                {
                  /* For PE, .lf and .ef get their value left alone,
                  && isym.n_scnum > 0)
                {
                  /* For PE, .lf and .ef get their value left alone,


@@ -2370,7 +2374,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
            {
              _bfd_error_handler
                /* xgettext: c-format */
            {
              _bfd_error_handler
                /* xgettext: c-format */

-               (_("%B: relocs in section `%A', but it has no contents"),
+               (_("%pB: relocs in section `%pA', but it has no contents"),

                 input_bfd, o);
              bfd_set_error (bfd_error_no_contents);
              return FALSE;
                 input_bfd, o);
              bfd_set_error (bfd_error_no_contents);
              return FALSE;


@@ -2433,8 +2437,8 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
              if (ps->flags & SEC_EXCLUDE)
                (*flaginfo->info->callbacks->einfo)
                  /* xgettext: c-format */
              if (ps->flags & SEC_EXCLUDE)
                (*flaginfo->info->callbacks->einfo)
                  /* xgettext: c-format */

-                 (_("%X`%s' referenced in section `%A' of %B: "
-                    "defined in discarded section `%A' of %B\n"),
+                 (_("%X`%s' referenced in section `%pA' of %pB: "
+                    "defined in discarded section `%pA' of %pB\n"),

                   h->root.root.string, o, input_bfd, ps, ps->owner);
            }
 
                   h->root.root.string, o, input_bfd, ps, ps->owner);
            }
 


@@ -2537,7 +2541,8 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
       /* Write out the modified section contents.  */
       if (secdata == NULL || secdata->stab_info == NULL)
        {
       /* Write out the modified section contents.  */
       if (secdata == NULL || secdata->stab_info == NULL)
        {

-         file_ptr loc = o->output_offset * bfd_octets_per_byte (output_bfd);
+         file_ptr loc = (o->output_offset
+                         * bfd_octets_per_byte (output_bfd, o));

          if (! bfd_set_section_contents (output_bfd, o->output_section,
                                          contents, loc, o->size))
            return FALSE;
          if (! bfd_set_section_contents (output_bfd, o->output_section,
                                          contents, loc, o->size))
            return FALSE;


@@ -2731,7 +2736,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data)
                      || bfd_link_relocatable (flaginfo->info)))
                _bfd_error_handler
                  /* xgettext: c-format */
                      || bfd_link_relocatable (flaginfo->info)))
                _bfd_error_handler
                  /* xgettext: c-format */

-                 (_("%B: %A: reloc overflow: %#x > 0xffff"),
+                 (_("%pB: %pA: reloc overflow: %#x > 0xffff"),

                   output_bfd, sec, sec->reloc_count);
 
              if (sec->lineno_count > 0xffff
                   output_bfd, sec, sec->reloc_count);
 
              if (sec->lineno_count > 0xffff


@@ -2739,7 +2744,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data)
                      || bfd_link_relocatable (flaginfo->info)))
                _bfd_error_handler
                  /* xgettext: c-format */
                      || bfd_link_relocatable (flaginfo->info)))
                _bfd_error_handler
                  /* xgettext: c-format */

-                 (_("%B: warning: %A: line number overflow: %#x > 0xffff"),
+                 (_("%pB: warning: %pA: line number overflow: %#x > 0xffff"),

                   output_bfd, sec, sec->lineno_count);
 
              auxp->x_scn.x_nreloc = sec->reloc_count;
                   output_bfd, sec, sec->lineno_count);
 
              auxp->x_scn.x_nreloc = sec->reloc_count;


@@ -2829,7 +2834,7 @@ _bfd_coff_reloc_link_order (bfd *output_bfd,
        return FALSE;
 
       rstat = _bfd_relocate_contents (howto, output_bfd,
        return FALSE;
 
       rstat = _bfd_relocate_contents (howto, output_bfd,

-                                     (bfd_vma) link_order->u.reloc.p->addend,\
+                                     (bfd_vma) link_order->u.reloc.p->addend,

                                      buf);
       switch (rstat)
        {
                                      buf);
       switch (rstat)
        {


@@ -2842,14 +2847,14 @@ _bfd_coff_reloc_link_order (bfd *output_bfd,
          (*flaginfo->info->callbacks->reloc_overflow)
            (flaginfo->info, NULL,
             (link_order->type == bfd_section_reloc_link_order
          (*flaginfo->info->callbacks->reloc_overflow)
            (flaginfo->info, NULL,
             (link_order->type == bfd_section_reloc_link_order

-             ? bfd_section_name (output_bfd,
-                                 link_order->u.reloc.p->u.section)
+             ? bfd_section_name (link_order->u.reloc.p->u.section)

              : link_order->u.reloc.p->u.name),
             howto->name, link_order->u.reloc.p->addend,
             (bfd *) NULL, (asection *) NULL, (bfd_vma) 0);
          break;
        }
              : link_order->u.reloc.p->u.name),
             howto->name, link_order->u.reloc.p->addend,
             (bfd *) NULL, (asection *) NULL, (bfd_vma) 0);
          break;
        }

-      loc = link_order->offset * bfd_octets_per_byte (output_bfd);
+      loc = link_order->offset * bfd_octets_per_byte (output_bfd,
+                                                     output_section);

       ok = bfd_set_section_contents (output_bfd, output_section, buf,
                                     loc, size);
       free (buf);
       ok = bfd_set_section_contents (output_bfd, output_section, buf,
                                     loc, size);
       free (buf);


@@ -2962,7 +2967,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
        {
          _bfd_error_handler
            /* xgettext: c-format */
        {
          _bfd_error_handler
            /* xgettext: c-format */

-           (_("%B: illegal symbol index %ld in relocs"), input_bfd, symndx);
+           (_("%pB: illegal symbol index %ld in relocs"), input_bfd, symndx);

          return FALSE;
        }
       else
          return FALSE;
        }
       else


@@ -3080,7 +3085,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
       if (sec != NULL && discarded_section (sec))
        {
          _bfd_clear_contents (howto, input_bfd, input_section,
       if (sec != NULL && discarded_section (sec))
        {
          _bfd_clear_contents (howto, input_bfd, input_section,

-                              contents + (rel->r_vaddr - input_section->vma));
+                              contents, rel->r_vaddr - input_section->vma);

          continue;
        }
 
          continue;
        }
 


@@ -3124,8 +3129,8 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
        case bfd_reloc_outofrange:
          _bfd_error_handler
            /* xgettext: c-format */
        case bfd_reloc_outofrange:
          _bfd_error_handler
            /* xgettext: c-format */

-           (_("%B: bad reloc address %#Lx in section `%A'"),
-            input_bfd, rel->r_vaddr, input_section);
+           (_("%pB: bad reloc address %#" PRIx64 " in section `%pA'"),
+            input_bfd, (uint64_t) rel->r_vaddr, input_section);

          return FALSE;
        case bfd_reloc_overflow:
          {
          return FALSE;
        case bfd_reloc_overflow:
          {