Add parens like the comment says.

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

diff --git a/bfd/elf.c b/bfd/elf.c
index 3aede147dfa0bfd7539b697a819b2ffa84b4eef9..5ae24eef07650ef3ef08b44525b99688a9cda0a1 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -3306,7 +3306,10 @@ prep_headers (abfd)
       i_ehdrp->e_machine = EM_S370;
       break;
     case bfd_arch_i386:
-      i_ehdrp->e_machine = EM_386;
+      if (bfd_get_arch_size (abfd) == 64)
+       i_ehdrp->e_machine = EM_X86_64;
+      else
+       i_ehdrp->e_machine = EM_386;
       break;
     case bfd_arch_ia64:
       i_ehdrp->e_machine = EM_IA_64;
@@ -4352,9 +4355,11 @@ swap_out_syms (abfd, sttp, relocatable_p)
        flagword flags = syms[idx]->flags;
        int type;
 
-       if (flags & BSF_SECTION_SYM)
-         /* Section symbols have no names.  */
-         sym.st_name = 0;
+       if ((flags & BSF_SECTION_SYM) != 0)
+         {
+           /* Section symbols have no name.  */
+           sym.st_name = 0;
+         }
        else
          {
            sym.st_name = (unsigned long) _bfd_stringtab_add (stt,
@@ -4998,7 +5003,8 @@ _bfd_elf_find_nearest_line (abfd,
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,
-                                    line_ptr, 0))
+                                    line_ptr, 0,
+                                    &elf_tdata (abfd)->dwarf2_find_line_info))
     return true;
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,