[committed] output function size on mips

[Eric Christopher]

This will enable objdump and readelf to see what the size of a function
is, currently we only had one test that checked for this information and
I fixed that up at the same time.

Tested on mips-elf, mips64-elf, and mips64-linux-gnu.

-eric

2005-02-22  Eric Christopher  <echristo@redhat.com>

	* config/tc-mips.c (struct proc): Change isym to
	func_sym. New member func_end_sym.
	(s_mips_ent): Update.
	(s_mips_end): Ditto. Add code to compute function size.

2005-02-22  Eric Christopher  <echristo@redhat.com>

	* ld-mips-elf/reloc-merge-lo16.d: Correct symbol
	table size for __start.

Index: gas/config/tc-mips.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-mips.c,v
retrieving revision 1.285
diff -u -p -r1.285 tc-mips.c
--- gas/config/tc-mips.c	22 Feb 2005 12:32:24 -0000	1.285
+++ gas/config/tc-mips.c	22 Feb 2005 23:39:29 -0000
@@ -13410,7 +13410,8 @@ mips_elf_final_processing (void)
 #endif /* OBJ_ELF || OBJ_MAYBE_ELF */
 
 typedef struct proc {
-  symbolS *isym;
+  symbolS *func_sym;
+  symbolS *func_end_sym;
   unsigned long reg_mask;
   unsigned long reg_offset;
   unsigned long fpreg_mask;
@@ -13594,7 +13595,7 @@ s_mips_end (int x ATTRIBUTE_UNUSED)
   if (p != NULL)
     {
       assert (S_GET_NAME (p));
-      if (strcmp (S_GET_NAME (p), S_GET_NAME (cur_proc_ptr->isym)))
+      if (strcmp (S_GET_NAME (p), S_GET_NAME (cur_proc_ptr->func_sym)))
 	as_warn (_(".end symbol does not match .ent symbol."));
 
       if (debug_type == DEBUG_STABS)
@@ -13604,6 +13605,21 @@ s_mips_end (int x ATTRIBUTE_UNUSED)
   else
     as_warn (_(".end directive missing or unknown symbol"));
 
+  /* Create an expression to calculate the size of the function.  */
+  if (p && cur_proc_ptr)
+    {
+      OBJ_SYMFIELD_TYPE *obj = symbol_get_obj (p);
+      expressionS *exp = xmalloc (sizeof (expressionS));
+
+      obj->size = exp;
+      exp->X_op = O_subtract;
+      exp->X_add_symbol = symbol_temp_new_now ();
+      exp->X_op_symbol = p;
+      exp->X_add_number = 0;
+
+      cur_proc_ptr->func_end_sym = exp->X_add_symbol;
+    }
+
 #ifdef OBJ_ELF
   /* Generate a .pdr section.  */
   if (OUTPUT_FLAVOR == bfd_target_elf_flavour && ! ECOFF_DEBUGGING
@@ -13677,7 +13693,7 @@ s_mips_ent (int aent)
       cur_proc_ptr = &cur_proc;
       memset (cur_proc_ptr, '\0', sizeof (procS));
 
-      cur_proc_ptr->isym = symbolP;
+      cur_proc_ptr->func_sym = symbolP;
 
       symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
 
Index: ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d,v
retrieving revision 1.1
diff -u -p -r1.1 reloc-merge-lo16.d
--- ld/testsuite/ld-mips-elf/reloc-merge-lo16.d	8 Jul 2004 15:43:00
-0000	1.1
+++ ld/testsuite/ld-mips-elf/reloc-merge-lo16.d	22 Feb 2005 23:39:29
-0000
@@ -8,7 +8,7 @@
 .*: +file format .*mips.*
 #...
 0+80fe70 l       .rodata	0+000000 g
-0+400000 g     F .text	0+000000 __start
+0+400000 g     F .text	0+00000c __start
 #...
 0+400000 <[^>]*> 3c020081 	lui	v0,0x81
 0+400004 <[^>]*> 2443fe70 	addiu	v1,v0,-400