Patchwork RFA: Fix spu --enable-werror-always build

login
register
mail settings
Submitter Joern Rennecke
Date Nov. 10, 2010, 5:15 p.m.
Message ID <20101110121553.l8bq6ovns4oowccg-nzlynne@webmail.spamcop.net>
Download mbox | patch
Permalink /patch/70652/
State New
Headers show

Comments

Joern Rennecke - Nov. 10, 2010, 5:15 p.m.
For the final.c warnings, see:
http://gcc.gnu.org/ml/gcc-patches/2010-11/msg01048.html

Patches for the remaining warnings are attached.

built on i686-pc-linux-gnu with gcc (GCC) 4.6.0 20101103 (experimental) .
2010-11-10  Joern Rennecke  <amylaar@spamcop.net>

	PR target/46417
	* config/spu/spu.c (spu_expand_insv): Remove unused variables.
	(spu_split_store): Use aform.
	(spu_function_profiler): Mark parameter labelno with ATTRIBUTE_UNUSED.
trevor_smigiel@playstation.sony.com - Nov. 10, 2010, 8:03 p.m.
That's fine. Approved.

Trevor

* Joern Rennecke <amylaar@spamcop.net> [2010-11-10 09:17]:
> For the final.c warnings, see:
> http://gcc.gnu.org/ml/gcc-patches/2010-11/msg01048.html
> 
> Patches for the remaining warnings are attached.
> 
> built on i686-pc-linux-gnu with gcc (GCC) 4.6.0 20101103 (experimental) .
> 

> 2010-11-10  Joern Rennecke  <amylaar@spamcop.net>
> 
> 	PR target/46417
> 	* config/spu/spu.c (spu_expand_insv): Remove unused variables.
> 	(spu_split_store): Use aform.
> 	(spu_function_profiler): Mark parameter labelno with ATTRIBUTE_UNUSED.
> 
> Index: config/spu/spu.c
> ===================================================================
> --- config/spu/spu.c	(revision 166544)
> +++ config/spu/spu.c	(working copy)
> @@ -749,9 +749,9 @@ spu_expand_insv (rtx ops[])
>    HOST_WIDE_INT width = INTVAL (ops[1]);
>    HOST_WIDE_INT start = INTVAL (ops[2]);
>    HOST_WIDE_INT maskbits;
> -  enum machine_mode dst_mode, src_mode;
> +  enum machine_mode dst_mode;
>    rtx dst = ops[0], src = ops[3];
> -  int dst_size, src_size;
> +  int dst_size;
>    rtx mask;
>    rtx shift_reg;
>    int shift;
> @@ -771,8 +771,6 @@ spu_expand_insv (rtx ops[])
>        src = force_reg (m, convert_to_mode (m, src, 0));
>      }
>    src = adjust_operand (src, 0);
> -  src_mode = GET_MODE (src);
> -  src_size = GET_MODE_BITSIZE (GET_MODE (src));
>  
>    mask = gen_reg_rtx (dst_mode);
>    shift_reg = gen_reg_rtx (dst_mode);
> @@ -4974,6 +4972,7 @@ spu_split_store (rtx * ops)
>  	}
>      }
>  
> +  gcc_assert (aform == 0 || aform == 1);
>    reg = gen_reg_rtx (TImode);
>  
>    scalar = store_with_one_insn_p (ops[0]);
> @@ -7111,7 +7110,7 @@ spu_split_convert (rtx ops[])
>  }
>  
>  void
> -spu_function_profiler (FILE * file, int labelno)
> +spu_function_profiler (FILE * file, int labelno ATTRIBUTE_UNUSED)
>  {
>    fprintf (file, "# profile\n");
>    fprintf (file, "brsl $75,  _mcount\n");

Patch

Index: config/spu/spu.c
===================================================================
--- config/spu/spu.c	(revision 166544)
+++ config/spu/spu.c	(working copy)
@@ -749,9 +749,9 @@  spu_expand_insv (rtx ops[])
   HOST_WIDE_INT width = INTVAL (ops[1]);
   HOST_WIDE_INT start = INTVAL (ops[2]);
   HOST_WIDE_INT maskbits;
-  enum machine_mode dst_mode, src_mode;
+  enum machine_mode dst_mode;
   rtx dst = ops[0], src = ops[3];
-  int dst_size, src_size;
+  int dst_size;
   rtx mask;
   rtx shift_reg;
   int shift;
@@ -771,8 +771,6 @@  spu_expand_insv (rtx ops[])
       src = force_reg (m, convert_to_mode (m, src, 0));
     }
   src = adjust_operand (src, 0);
-  src_mode = GET_MODE (src);
-  src_size = GET_MODE_BITSIZE (GET_MODE (src));
 
   mask = gen_reg_rtx (dst_mode);
   shift_reg = gen_reg_rtx (dst_mode);
@@ -4974,6 +4972,7 @@  spu_split_store (rtx * ops)
 	}
     }
 
+  gcc_assert (aform == 0 || aform == 1);
   reg = gen_reg_rtx (TImode);
 
   scalar = store_with_one_insn_p (ops[0]);
@@ -7111,7 +7110,7 @@  spu_split_convert (rtx ops[])
 }
 
 void
-spu_function_profiler (FILE * file, int labelno)
+spu_function_profiler (FILE * file, int labelno ATTRIBUTE_UNUSED)
 {
   fprintf (file, "# profile\n");
   fprintf (file, "brsl $75,  _mcount\n");