2002-10-31 David O'Brien <obrien@FreeBSD.org>

	* config/tc-ia64.c: Cast dwarf2_directive_file to int.
	* config/tc-sparc.c: Likewise.
	* config/tc-alpha.c: Cast s_alpha_file to int.
	* config/tc-alpha.h (TC_INIT_FIX_DATA): info is of type struct
	alpha_reloc_tag.

Approved by:  Alan Modra <amodra@bigpond.net.au>
              Message-ID: <20021012184546.W979@bubble.sa.bigpond.net.au>

diff --git a/gas/ChangeLog b/gas/ChangeLog
index dad9751b114f2811c4737d39ac23ab8ef72f941b..6aafb0417fc75d44a8756bb35aac26ea008d4b2f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-31  David O'Brien  <obrien@FreeBSD.org>
+
+       * config/tc-ia64.c: Cast dwarf2_directive_file to int.
+       * config/tc-sparc.c: Likewise.
+       * config/tc-alpha.c: Cast s_alpha_file to int.
+       * config/tc-alpha.h (TC_INIT_FIX_DATA): info is of type struct
+       alpha_reloc_tag.
+
 2002-10-30  Daniel Jacobowitz  <drow@mvista.com>
 
        * configure.in: Update ARM CPU patterns.

diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 6ebd154e0c90ea603e62ad04e7820576ab1f921f..8940256a5ff9d67e02ffd3bf130fe48d5bf5118c 100644 (file)
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -5494,7 +5494,7 @@ const pseudo_typeS md_pseudo_table[] = {
   {"fmask", s_alpha_mask, 1},
   {"frame", s_alpha_frame, 0},
   {"prologue", s_alpha_prologue, 0},
-  {"file", s_alpha_file, 5},
+  {"file", (void (*) PARAMS ((int))) s_alpha_file, 5},
   {"loc", s_alpha_loc, 9},
   {"stabs", s_alpha_stab, 's'},
   {"stabn", s_alpha_stab, 'n'},

diff --git a/gas/config/tc-alpha.h b/gas/config/tc-alpha.h
index 247fea6f7a30dec79af5ea44a8c42b511820e338..4918b204325d764f68a31c5a6e9cfd99c9b062a1 100644 (file)
--- a/gas/config/tc-alpha.h
+++ b/gas/config/tc-alpha.h
@@ -152,7 +152,7 @@ struct alpha_fix_tag
 #define TC_INIT_FIX_DATA(fixP)                                         \
 do {                                                                   \
   fixP->tc_fix_data.next_reloc = (struct fix *)0;                      \
-  fixP->tc_fix_data.info = (struct alpha_literal_tag *)0;              \
+  fixP->tc_fix_data.info = (struct alpha_reloc_tag *)0;                        \
 } while (0)
 
 /* Work with DEBUG5 to print fields in tc_fix_type.  */

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index ae26adac1fe118ecf99ee84a51956e674de0d2ec..a634d809552191bf266c96af072b03eb1343a4c4 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -4827,7 +4827,7 @@ const pseudo_typeS md_pseudo_table[] =
     { "body", dot_body, 0 },
     { "prologue", dot_prologue, 0 },
     { "endp", dot_endp, 0 },
-    { "file", dwarf2_directive_file, 0 },
+    { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
     { "loc", dwarf2_directive_loc, 0 },
 
     { "fframe", dot_fframe, 0 },

diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 5c610a9670e67a41ea2d51919c2f16e422882d9b..5fa4fe980f3c153091770bcd06de52df62789f8f 100644 (file)
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -159,7 +159,7 @@ const pseudo_typeS md_pseudo_table[] =
   {"uaword", s_uacons, 4},
   {"uaxword", s_uacons, 8},
 #ifdef OBJ_ELF
-  {"file", dwarf2_directive_file, 0},
+  {"file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0},
   {"loc", dwarf2_directive_loc, 0},
   /* These are specific to sparc/svr4.  */
   {"2byte", s_uacons, 2},