[PATCH 1/4] nm: also retrieve size for COFF function symbols

[Jan Beulich]

Like ELF for all symbols, COFF can record size for at least function
ones. Use that - if available - in preference to the distance-to-next-
symbol heuristic.

To be able to use the new test there, make TI C54x follow TI C4x in
providing .sdef to cover for .def already having different meaning.
---
Something similar but not identical to TI C4x/C54x could be done for
Arm, which also has .def. Imo there it would be more logical to wire
it directly to obj_coff_def() when -mccs is not in effect. Resorting
to .sdef would only be needed if the functionality could conceivably
be needed even when -mccs is specified (which I can't tell at all).

Should a value really be displayed for "File"-type symbols? That's
the "next" index, not a value, after all. (For ELF the value is also
displayed, but there it's usually zero anyway and has no other
meaning.) Then again omitting the value may break tools parsing the
output.

--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -79,7 +79,14 @@ struct extended_symbol_info
 #define SYM_STAB_DESC(sym)   (sym->sinfo->stab_desc)
 #define SYM_STAB_OTHER(sym)  (sym->sinfo->stab_other)
 #define SYM_SIZE(sym) \
-  (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
+  (sym->elfinfo \
+   ? sym->elfinfo->internal_elf_sym.st_size \
+   : sym->coffinfo \
+     && ISFCN (sym->coffinfo->native->u.syment.n_type) \
+     && sym->coffinfo->native->u.syment.n_numaux \
+     && sym->coffinfo->native[1].u.auxent.x_sym.x_misc.x_fsize \
+     ? sym->coffinfo->native[1].u.auxent.x_sym.x_misc.x_fsize \
+     : sym->ssize)
 
 /* The output formatting functions.  */
 static void print_object_filename_bsd (const char *);
@@ -1036,9 +1043,9 @@ size_forward2 (const void *P_x, const vo
     return sorters[0][reverse_sort] (x->minisym, y->minisym);
 }
 
-/* Sort the symbols by size.  ELF provides a size but for other formats
-   we have to make a guess by assuming that the difference between the
-   address of a symbol and the address of the next higher symbol is the
+/* Sort the symbols by size.  ELF and COFF may provide a size but for other
+   formats we have to make a guess by assuming that the difference between
+   the address of a symbol and the address of the next higher symbol is the
    size.  */
 
 static long
@@ -1081,6 +1088,7 @@ sort_symbols_by_size (bfd *abfd, bool is
       asection *sec;
       bfd_vma sz;
       asymbol *temp;
+      const coff_symbol_type *coffsym;
 
       if (from + size < fromend)
 	{
@@ -1103,6 +1111,12 @@ sort_symbols_by_size (bfd *abfd, bool is
 	  && bfd_get_flavour (abfd) == bfd_target_elf_flavour)
 	sz = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;
       else if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0
+	       && (coffsym = coff_symbol_from (sym)) != NULL
+	       && ISFCN (coffsym->native->u.syment.n_type)
+	       && coffsym->native->u.syment.n_numaux != 0
+	       && coffsym->native[1].u.auxent.x_sym.x_misc.x_fsize != 0)
+	sz = coffsym->native[1].u.auxent.x_sym.x_misc.x_fsize;
+      else if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0
 	       && bfd_is_com_section (sec))
 	sz = sym->value;
       else
--- /dev/null
+++ b/binutils/testsuite/binutils-all/nm-coff-1.s
@@ -0,0 +1,26 @@
+	.globl text_symbol1
+	.globl text_symbol2
+	.globl text_symbol3
+	.macro ENDFN name:req
+	.def \name
+	.type 0x20	/* DT_FUNC */
+	.scl 2		/* C_EXT */
+	.endef
+	.def \name
+	.scl 0xff	/* C_EFCN */
+	.val .
+	.endef
+	.endm
+	.text
+text_symbol1:
+	.long 0
+	.long 0
+	.long 0
+	ENDFN text_symbol1
+text_symbol2:
+	.long 0
+	.long 0
+	ENDFN text_symbol2
+text_symbol3:
+	.long 0
+	ENDFN text_symbol3
--- /dev/null
+++ b/binutils/testsuite/binutils-all/nm-coff-sdef-1.s
@@ -0,0 +1,26 @@
+	.globl text_symbol1
+	.globl text_symbol2
+	.globl text_symbol3
+	.macro ENDFN name:req
+	.sdef \name
+	.type 0x20	/* DT_FUNC */
+	.scl 2		/* C_EXT */
+	.endef
+	.sdef \name
+	.scl 0xff	/* C_EFCN */
+	.val .
+	.endef
+	.endm
+	.text
+text_symbol1:
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	ENDFN text_symbol1
+text_symbol2:
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	ENDFN text_symbol2
+text_symbol3:
+	.byte 0,0,0,0
+	ENDFN text_symbol3
--- a/binutils/testsuite/binutils-all/nm.exp
+++ b/binutils/testsuite/binutils-all/nm.exp
@@ -163,6 +163,12 @@ if {   [is_elf_format]
     || [istarget wasm32-*-*]
     || [istarget bpf-*-*]} {
     set nm_1_src "nm-elf-1.s"
+} elseif {[is_coff_format] && ![istarget arm*-*-*]} {
+    if {[istarget *c4x-*-*] || [istarget *c54x-*-*]} {
+	set nm_1_src "nm-coff-sdef-1.s"
+    } else {
+	set nm_1_src "nm-coff-1.s"
+    }
 } else {
     set nm_1_src "nm-1.s"
 }
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -1887,8 +1887,8 @@ static const pseudo_typeS coff_pseudo_ta
   {"loc", obj_coff_loc, 0},
   {"optim", s_ignore, 0},	/* For sun386i cc (?) */
   {"weak", obj_coff_weak, 0},
-#if defined TC_TIC4X
-  /* The tic4x uses sdef instead of def.  */
+#if defined (TC_TIC4X) || defined (TC_TIC54X)
+  /* The tic4x and tic54x use sdef instead of def.  */
   {"sdef", obj_coff_def, 0},
 #endif
 #if defined(SEH_CMDS)