Makefile.in (mips-tfile.o-warn): Don't error out on mips-tfile.c warnings.

	* Makefile.in (mips-tfile.o-warn): Don't error out on mips-tfile.c
	warnings.
	* mips-tfile.c (copy_object): Cast alloca result to int *.
	* mips-tdump.c (print_symbol): Cast xmalloc return values to
	proper types.
	Rename class to sclass.
	(read_tfile): Cast read_seek return values to proper types.
	Cast xcalloc return value to proper type.

From-SVN: r140158

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6b91ca8954c2aaed4ac41a7b7708aa7b5b3da7d..66b6584588fe4982049036c3154114882d7cc052 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * Makefile.in (mips-tfile.o-warn): Don't error out on mips-tfile.c
+       warnings.
+       * mips-tfile.c (copy_object): Cast alloca result to int *.
+       * mips-tdump.c (print_symbol): Cast xmalloc return values to
+       proper types.
+       Rename class to sclass.
+       (read_tfile): Cast read_seek return values to proper types.
+       Cast xcalloc return value to proper type.
+
 2008-09-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * config/sol2.h (REGISTER_TARGET_PRAGMAS): Move ...

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4a4bfc2f2caa17cff866dc2f687f9cee5e96052f..49c394d79be63d950c6e75237cf7d70afeb98ee4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -185,6 +185,8 @@ bitmap.o-warn = -Wno-error
 dominance.o-warn = -Wno-error
 # graphite.c contains code calling cloog that has problems.
 graphite.o-warn = -Wno-error
+# mips-tfile.c contains -Wcast-qual warnings.
+mips-tfile.o-warn = -Wno-error
 
 # All warnings have to be shut off in stage1 if the compiler used then
 # isn't gcc; configure determines that.  WARN_CFLAGS will be either

diff --git a/gcc/mips-tdump.c b/gcc/mips-tdump.c
index cc43e85bdbe6bc787f3c6453c36e260fae393c4b..2164a6e4b488c899caf3c3d8bdf5f58e0ea87120 100644 (file)
--- a/gcc/mips-tdump.c
+++ b/gcc/mips-tdump.c
@@ -883,7 +883,7 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
        if (want_scope)
          {
            if (free_scope == (scope_t *) 0)
-             scope_ptr = xmalloc (sizeof (scope_t));
+             scope_ptr = (scope_t *) xmalloc (sizeof (scope_t));
            else
              {
                scope_ptr = free_scope;
@@ -937,7 +937,7 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
        if (want_scope)
          {
            if (free_scope == (scope_t *) 0)
-             scope_ptr = xmalloc (sizeof (scope_t));
+             scope_ptr = (scope_t *) xmalloc (sizeof (scope_t));
            else
              {
                scope_ptr = free_scope;
@@ -980,19 +980,19 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
               scope_ptr != (scope_t *) 0;
               scope_ptr = scope_ptr->prev)
            {
-             const char *class;
+             const char *sclass;
              if (scope_ptr->st == st_Proc || scope_ptr->st == st_StaticProc)
-               class = "func.";
+               sclass = "func.";
              else if (scope_ptr->st == st_File)
-               class = "file";
+               sclass = "file";
              else if (scope_ptr->st == st_Block && scope_ptr->sc == sc_Text)
-               class = "block";
+               sclass = "block";
              else if (scope_ptr->st == st_Block && scope_ptr->sc == sc_Info)
-               class = "type";
+               sclass = "type";
              else
-               class = "???";
+               sclass = "???";
 
-             printf (" %ld [%s]", scope_ptr->open_sym, class);
+             printf (" %ld [%s]", scope_ptr->open_sym, sclass);
            }
          printf ("\n");
        }
@@ -1345,41 +1345,44 @@ read_tfile (void)
 
   print_sym_hdr (&sym_hdr);
 
-  lines = read_seek (NULL, sym_hdr.cbLine, sym_hdr.cbLineOffset,
-                    "Line numbers");
+  lines = (LINER *) read_seek (NULL, sym_hdr.cbLine, sym_hdr.cbLineOffset,
+                              "Line numbers");
 
-  dense_nums = read_seek (NULL, sym_hdr.idnMax * sizeof (DNR),
-                         sym_hdr.cbDnOffset, "Dense numbers");
+  dense_nums = (DNR *) read_seek (NULL, sym_hdr.idnMax * sizeof (DNR),
+                                 sym_hdr.cbDnOffset, "Dense numbers");
 
-  proc_desc = read_seek (NULL, sym_hdr.ipdMax * sizeof (PDR),
-                        sym_hdr.cbPdOffset, "Procedure tables");
+  proc_desc = (PDR *) read_seek (NULL, sym_hdr.ipdMax * sizeof (PDR),
+                                sym_hdr.cbPdOffset, "Procedure tables");
 
-  l_symbols = read_seek (NULL, sym_hdr.isymMax * sizeof (SYMR),
-                        sym_hdr.cbSymOffset, "Local symbols");
+  l_symbols = (SYMR *) read_seek (NULL, sym_hdr.isymMax * sizeof (SYMR),
+                                 sym_hdr.cbSymOffset, "Local symbols");
 
-  opt_symbols = read_seek (NULL, sym_hdr.ioptMax * sizeof (OPTR),
-                          sym_hdr.cbOptOffset, "Optimization symbols");
+  opt_symbols = (OPTR *) read_seek (NULL, sym_hdr.ioptMax * sizeof (OPTR),
+                                   sym_hdr.cbOptOffset,
+                                   "Optimization symbols");
 
-  aux_symbols = read_seek (NULL, sym_hdr.iauxMax * sizeof (AUXU),
-                          sym_hdr.cbAuxOffset, "Auxiliary symbols");
+  aux_symbols = (AUXU *) read_seek (NULL, sym_hdr.iauxMax * sizeof (AUXU),
+                                   sym_hdr.cbAuxOffset, "Auxiliary symbols");
 
   if (sym_hdr.iauxMax > 0)
-    aux_used = xcalloc (sym_hdr.iauxMax, 1);
+    aux_used = (char *) xcalloc (sym_hdr.iauxMax, 1);
 
-  l_strings = read_seek (NULL, sym_hdr.issMax,
-                        sym_hdr.cbSsOffset, "Local string table");
+  l_strings = (char *) read_seek (NULL, sym_hdr.issMax,
+                                 sym_hdr.cbSsOffset, "Local string table");
 
-  e_strings = read_seek (NULL, sym_hdr.issExtMax,
-                        sym_hdr.cbSsExtOffset, "External string table");
+  e_strings = (char *) read_seek (NULL, sym_hdr.issExtMax,
+                                 sym_hdr.cbSsExtOffset,
+                                 "External string table");
 
-  file_desc = read_seek (NULL, sym_hdr.ifdMax * sizeof (FDR),
-                        sym_hdr.cbFdOffset, "File tables");
+  file_desc = (FDR *) read_seek (NULL, sym_hdr.ifdMax * sizeof (FDR),
+                                sym_hdr.cbFdOffset, "File tables");
 
-  rfile_desc = read_seek (NULL, sym_hdr.crfd * sizeof (ulong),
-                         sym_hdr.cbRfdOffset, "Relative file tables");
+  rfile_desc = (ulong *) read_seek (NULL, sym_hdr.crfd * sizeof (ulong),
+                                   sym_hdr.cbRfdOffset,
+                                   "Relative file tables");
 
-  e_symbols = read_seek (NULL, sym_hdr.iextMax * sizeof (EXTR),
-                        sym_hdr.cbExtOffset, "External symbols");
+  e_symbols = (EXTR *) read_seek (NULL, sym_hdr.iextMax * sizeof (EXTR),
+                                 sym_hdr.cbExtOffset, "External symbols");
 }
 
 \f

diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index 56a953747e42d84d8bf1b63656126d3d4fad1353..87b278ab4d6d016ae64a508e5ab857cfcb2a7252 100644 (file)
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -4469,7 +4469,7 @@ copy_object (void)
      (in case there are duplicate filenames, we collapse them into one
      file section, the MIPS assembler may or may not collapse them).  */
 
-  remap_file_number = alloca (sizeof (int) * orig_sym_hdr.ifdMax);
+  remap_file_number = (int *) alloca (sizeof (int) * orig_sym_hdr.ifdMax);
 
   for (fd = delete_ifd; fd < orig_sym_hdr.ifdMax; fd++)
     {