Remove last boolean argumont of output_function_profiler(), it is always invoked

with the same value.

4 files changed, 22 insertions, 31 deletions

diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/m88k-protos.h b/gnu/usr.bin/gcc/gcc/config/m88k/m88k-protos.h
index c3ea5bd50ee..3bf369858fe 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/m88k-protos.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/m88k-protos.h
@@ -78,7 +78,7 @@ extern int integer_ok_for_set PARAMS ((unsigned));
 extern void m88k_layout_frame PARAMS ((void));
 extern void m88k_expand_prologue PARAMS ((void));
 extern void m88k_expand_epilogue PARAMS ((void));
-extern void output_function_profiler PARAMS ((FILE *, int, const char *, int));
+extern void output_function_profiler PARAMS ((FILE *, int, const char *));
 extern void output_ascii PARAMS ((FILE *, const char *, int,
 				  const char *, int));
 extern void output_label PARAMS ((int));
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
index 10b003bab72..da78aed7ca9 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.c
@@ -2310,52 +2310,46 @@ output_tdesc (file, offset)
 
 /* Output assembler code to FILE to increment profiler label # LABELNO
    for profiling a function entry.  NAME is the mcount function name
-   (varies), SAVEP indicates whether the parameter registers need to
-   be saved and restored.  */
+   (varies).  */
 
 void
-output_function_profiler (file, labelno, name, savep)
+output_function_profiler (file, labelno, name)
      FILE *file;
      int labelno;
      const char *name;
-     int savep;
 {
   char label[256];
   char dbi[256];
-  const char *const temp = (savep ? reg_names[2] : reg_names[10]);
 
   /* Remember to update FUNCTION_PROFILER_LENGTH.  */
 
-  if (savep)
-    {
-      fprintf (file, "\tsubu\t %s,%s,32\n", reg_names[31], reg_names[31]);
-      fprintf (file, "\tst.d\t %s,%s,0\n", reg_names[2], reg_names[31]);
-      fprintf (file, "\tst.d\t %s,%s,8\n", reg_names[4], reg_names[31]);
-      fprintf (file, "\tst.d\t %s,%s,16\n", reg_names[6], reg_names[31]);
-      fprintf (file, "\tst.d\t %s,%s,24\n", reg_names[8], reg_names[31]);
-    }
+  fprintf (file, "\tsubu\t %s,%s,32\n", reg_names[31], reg_names[31]);
+  fprintf (file, "\tst.d\t %s,%s,0\n", reg_names[2], reg_names[31]);
+  fprintf (file, "\tst.d\t %s,%s,8\n", reg_names[4], reg_names[31]);
+  fprintf (file, "\tst.d\t %s,%s,16\n", reg_names[6], reg_names[31]);
+  fprintf (file, "\tst.d\t %s,%s,24\n", reg_names[8], reg_names[31]);
 
   ASM_GENERATE_INTERNAL_LABEL (label, "LP", labelno);
   if (flag_pic == 2)
     {
       fprintf (file, "\tor.u\t %s,%s,%shi16(%s#got_rel)\n",
-	       temp, reg_names[0], m88k_pound_sign, &label[1]);
+	       reg_names[2], reg_names[0], m88k_pound_sign, &label[1]);
       fprintf (file, "\tor\t %s,%s,%slo16(%s#got_rel)\n",
-	       temp, temp, m88k_pound_sign, &label[1]);
-      sprintf (dbi, "\tld\t %s,%s,%s\n", temp,
-	       reg_names[PIC_OFFSET_TABLE_REGNUM], temp);
+	       reg_names[2], reg_names[2], m88k_pound_sign, &label[1]);
+      sprintf (dbi, "\tld\t %s,%s,%s\n", reg_names[2],
+	       reg_names[PIC_OFFSET_TABLE_REGNUM], reg_names[2]);
     }
   else if (flag_pic)
     {
-      sprintf (dbi, "\tld\t %s,%s,%s#got_rel\n", temp,
+      sprintf (dbi, "\tld\t %s,%s,%s#got_rel\n", reg_names[2],
 	       reg_names[PIC_OFFSET_TABLE_REGNUM], &label[1]);
     }
   else
     {
       fprintf (file, "\tor.u\t %s,%s,%shi16(%s)\n",
-	       temp, reg_names[0], m88k_pound_sign, &label[1]);
+	       reg_names[2], reg_names[0], m88k_pound_sign, &label[1]);
       sprintf (dbi, "\tor\t %s,%s,%slo16(%s)\n",
-	       temp, temp, m88k_pound_sign, &label[1]);
+	       reg_names[2], reg_names[2], m88k_pound_sign, &label[1]);
     }
 
   if (flag_pic)
@@ -2364,14 +2358,11 @@ output_function_profiler (file, labelno, name, savep)
     fprintf (file, "\tbsr.n\t %s\n", name);
   fputs (dbi, file);
 
-  if (savep)
-    {
-      fprintf (file, "\tld.d\t %s,%s,0\n", reg_names[2], reg_names[31]);
-      fprintf (file, "\tld.d\t %s,%s,8\n", reg_names[4], reg_names[31]);
-      fprintf (file, "\tld.d\t %s,%s,16\n", reg_names[6], reg_names[31]);
-      fprintf (file, "\tld.d\t %s,%s,24\n", reg_names[8], reg_names[31]);
-      fprintf (file, "\taddu\t %s,%s,32\n", reg_names[31], reg_names[31]);
-    }
+  fprintf (file, "\tld.d\t %s,%s,0\n", reg_names[2], reg_names[31]);
+  fprintf (file, "\tld.d\t %s,%s,8\n", reg_names[4], reg_names[31]);
+  fprintf (file, "\tld.d\t %s,%s,16\n", reg_names[6], reg_names[31]);
+  fprintf (file, "\tld.d\t %s,%s,24\n", reg_names[8], reg_names[31]);
+  fprintf (file, "\taddu\t %s,%s,32\n", reg_names[31], reg_names[31]);
 }
 
 /* Determine whether a function argument is passed in a register, and
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
index 83daa2c0779..fd4a8808832 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/m88k.h
@@ -944,7 +944,7 @@ enum reg_class { NO_REGS, AP_REG, XRF_REGS, GENERAL_REGS, AGRF_REGS,
    for profiling a function entry.  Redefined in sysv3.h, sysv4.h and
    dgux.h.  */
 #define FUNCTION_PROFILER(FILE, LABELNO) \
-  output_function_profiler (FILE, LABELNO, "mcount", 1)
+  output_function_profiler (FILE, LABELNO, "mcount")
 
 /* Maximum length in instructions of the code output by FUNCTION_PROFILER.  */
 #define FUNCTION_PROFILER_LENGTH (5+3+1+5)
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/sysv4.h b/gnu/usr.bin/gcc/gcc/config/m88k/sysv4.h
index 64695d1b726..9fb8632a826 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/sysv4.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/sysv4.h
@@ -56,7 +56,7 @@ Boston, MA 02111-1307, USA.  */
 /* For the AT&T SVR4 port, the function is _mcount.  */
 #undef	FUNCTION_PROFILER
 #define FUNCTION_PROFILER(FILE, LABELNO) \
-  output_function_profiler (FILE, LABELNO, "_mcount", 1)
+  output_function_profiler (FILE, LABELNO, "_mcount")
 
 /* Override svr4.h and m88k.h.  */
 #undef	INIT_SECTION_ASM_OP