Clean up some of the obvious m88k bitrot.

It still doesn't actually compile, though.

diff --git a/gas/config/tc-m88k.c b/gas/config/tc-m88k.c
index 237f49e87a8509f65d6a5d0a808f42e5d6fa444f..9f3a8e4a266fa9ac028e713564abb6cf6719eb98 100644 (file)
--- a/gas/config/tc-m88k.c
+++ b/gas/config/tc-m88k.c
@@ -208,13 +208,13 @@ md_begin ()
     }
 }
 
-void
+int
 md_parse_option (argP, cntP, vecP)
      char **argP;
      int *cntP;
      char ***vecP;
 {
-  as_warn ("unknown option: -%s", *argP);
+  return 0;
 }
 
 void
@@ -924,7 +924,7 @@ getval (param, valp)
 void
 md_number_to_chars (buf, val, nbytes)
      char *buf;
-     int val;
+     valueT val;
      int nbytes;
 {
   switch (nbytes)
@@ -1100,11 +1100,11 @@ int md_short_jump_size = 4;
 void
 md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;
-     long from_addr, to_addr;
+     addressT from_addr, to_addr;
      fragS *frag;
      symbolS *to_symbol;
 {
-  ptr[0] = 0xc0;
+  ptr[0] = (char) 0xc0;
   ptr[1] = 0x00;
   ptr[2] = 0x00;
   ptr[3] = 0x00;
@@ -1123,11 +1123,11 @@ int md_long_jump_size = 4;
 void
 md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
      char *ptr;
-     long from_addr, to_addr;
+     addressT from_addr, to_addr;
      fragS *frag;
      symbolS *to_symbol;
 {
-  ptr[0] = 0xc0;
+  ptr[0] = (char) 0xc0;
   ptr[1] = 0x00;
   ptr[2] = 0x00;
   ptr[3] = 0x00;
@@ -1144,7 +1144,7 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
 int
 md_estimate_size_before_relax (fragP, segment_type)
      fragS *fragP;
-     int segment_type;
+     segT segment_type;
 {
   as_fatal ("Relaxation should never occur");
 }
@@ -1152,13 +1152,6 @@ md_estimate_size_before_relax (fragP, segment_type)
 const relax_typeS md_relax_table[] =
 {0};
 
-void
-md_convert_frag (fragP)
-     fragS *fragP;
-{
-  as_fatal ("Relaxation should never occur");
-}
-
 void
 md_end ()
 {
@@ -1228,7 +1221,6 @@ s_bss ()
   char *p;
   int temp, bss_align;
   symbolS *symbolP;
-  extern const char is_end_of_line[256];
 
   name = input_line_pointer;
   c = get_symbol_end ();

diff --git a/gas/config/tc-m88k.h b/gas/config/tc-m88k.h
index 8c32449cd8d75c7b78acca4fedf89ed5a1df1efb..677cdb76ec91278d9e0ddea4592b874b957d474d 100644 (file)
--- a/gas/config/tc-m88k.h
+++ b/gas/config/tc-m88k.h
@@ -20,6 +20,8 @@ You should have received a copy of the GNU General Public License
 along with GAS; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#define NEED_FX_R_TYPE
+
 /* different type of relocation available in the m88k */
 
 enum reloc_type
@@ -47,3 +49,9 @@ struct reloc_info_m88k
 
 #define LOCAL_LABEL(name) (name[0] =='@' \
                          && ( name [1] == 'L' || name [1] == '.' ))
+
+#ifndef BFD_ASSEMBLER
+#define md_convert_frag(h,f)           {as_fatal ("m88k convert_frag\n");}
+#else
+#define md_convert_frag(b,s,f)         {as_fatal ("m88k convert_frag\n");}
+#endif