From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Sun, 18 May 2014 19:28:04 +0000 (+0100)
Subject: gas/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd5c94abf6b9e73f758ec6ae2ae3de6c57ff78a9;p=binutils-gdb.git

gas/
	* config/tc-mips.c (md_obj_begin): Delete.
	(md_obj_end): Fold into...
	(md_mips_end): ...here.  Move to end of file.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5db5e377ce8..22435700091 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.c (md_obj_begin): Delete.
+	(md_obj_end): Fold into...
+	(md_mips_end): ...here.  Move to end of file.
+
 2014-05-17  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/16946
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 7739d954fb1..95ffe504554 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1295,8 +1295,6 @@ static void s_ehword (int);
 static void s_cpadd (int);
 static void s_insn (int);
 static void s_nan (int);
-static void md_obj_begin (void);
-static void md_obj_end (void);
 static void s_mips_ent (int);
 static void s_mips_end (int);
 static void s_mips_frame (int);
@@ -3629,21 +3627,10 @@ md_begin (void)
     subseg_set (seg, subseg);
   }
 
-  if (! ECOFF_DEBUGGING)
-    md_obj_begin ();
-
   if (mips_fix_vr4120)
     init_vr4120_conflicts ();
 }
 
-void
-md_mips_end (void)
-{
-  mips_emit_delays ();
-  if (! ECOFF_DEBUGGING)
-    md_obj_end ();
-}
-
 void
 md_assemble (char *str)
 {
@@ -17522,19 +17509,6 @@ mips_handle_align (fragS *fragp)
   fragp->fr_var = size;
 }
 
-static void
-md_obj_begin (void)
-{
-}
-
-static void
-md_obj_end (void)
-{
-  /* Check for premature end, nesting errors, etc.  */
-  if (cur_proc_ptr)
-    as_warn (_("missing .end at end of assembly"));
-}
-
 static long
 get_number (void)
 {
@@ -18375,3 +18349,11 @@ mips_convert_symbolic_attribute (const char *name)
 
   return -1;
 }
+
+void
+md_mips_end (void)
+{
+  mips_emit_delays ();
+  if (cur_proc_ptr)
+    as_warn (_("missing .end at end of assembly"));
+}