Patchwork [buildrobot] score: Silence warnings to fix config-list.mk build

login
register
mail settings
Submitter Jan-Benedict Glaw
Date Dec. 5, 2013, 9:17 p.m.
Message ID <20131205211737.GB30563@lug-owl.de>
Download mbox | patch
Permalink /patch/297397/
State New
Headers show

Comments

Jan-Benedict Glaw - Dec. 5, 2013, 9:17 p.m.
Hi!

This patch silences warnings (unused static functions, ambiguous
`else') for the score target.

2013-12-05  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

	* config/score/score.c (score_force_temporary): Delete function.
	(score_split_symbol): Ditto.
	* config/score/score.h (ASM_OUTPUT_ADDR_DIFF_ELT): Add extra
	parentheses to silence ambiguity warning.

 





Ok?

MfG, JBG
Jeff Law - Dec. 5, 2013, 9:22 p.m.
On 12/05/13 14:17, Jan-Benedict Glaw wrote:
> Hi!
>
> This patch silences warnings (unused static functions, ambiguous
> `else') for the score target.
>
> 2013-12-05  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
>
> 	* config/score/score.c (score_force_temporary): Delete function.
> 	(score_split_symbol): Ditto.
> 	* config/score/score.h (ASM_OUTPUT_ADDR_DIFF_ELT): Add extra
> 	parentheses to silence ambiguity warning.

[snip]

> diff --git a/gcc/config/score/score.h b/gcc/config/score/score.h
> index 5ab7875..e3bb7f0 100644
> --- a/gcc/config/score/score.h
> +++ b/gcc/config/score/score.h
> @@ -757,11 +757,12 @@ typedef struct score_args
>      entries PC-relative in GP-relative when .gp(d)word is supported.  */
>   #define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)                \
>     do {                                                                    \
> -    if (TARGET_SCORE7)                                                    \
> +    if (TARGET_SCORE7) {                                                  \
>         if (flag_pic)                                                       \
>           fprintf (STREAM, "\t.gpword %sL%d\n", LOCAL_LABEL_PREFIX, VALUE); \
>         else                                                                \
>           fprintf (STREAM, "\t.word %sL%d\n", LOCAL_LABEL_PREFIX, VALUE);   \
> +    }                                                                     \
>     } while (0)
>
>   /* Jump table alignment is explicit in ASM_OUTPUT_CASE_LABEL.  */
Formatting nit.  The open curley should be on its own line, indented 2 
spaces relative to its conditional.  Its close paren should also be on 
its own line at the same indention level as the open curley.

Note this will cause all the code inside the new curleys to need to be 
reindented as well.

jeff
Jan-Benedict Glaw - Dec. 5, 2013, 9:33 p.m.
On Thu, 2013-12-05 14:22:46 -0700, Jeff Law <law@redhat.com> wrote:
> On 12/05/13 14:17, Jan-Benedict Glaw wrote:
> >diff --git a/gcc/config/score/score.h b/gcc/config/score/score.h
> >index 5ab7875..e3bb7f0 100644
> >--- a/gcc/config/score/score.h
> >+++ b/gcc/config/score/score.h
> >@@ -757,11 +757,12 @@ typedef struct score_args
> >     entries PC-relative in GP-relative when .gp(d)word is supported.  */
> >  #define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)                \
> >    do {                                                                    \
> >-    if (TARGET_SCORE7)                                                    \
> >+    if (TARGET_SCORE7) {                                                  \
> >        if (flag_pic)                                                       \
> >          fprintf (STREAM, "\t.gpword %sL%d\n", LOCAL_LABEL_PREFIX, VALUE); \
> >        else                                                                \
> >          fprintf (STREAM, "\t.word %sL%d\n", LOCAL_LABEL_PREFIX, VALUE);   \
> >+    }                                                                     \
> >    } while (0)
> >
> >  /* Jump table alignment is explicit in ASM_OUTPUT_CASE_LABEL.  */
> Formatting nit.  The open curley should be on its own line, indented
> 2 spaces relative to its conditional.  Its close paren should also
> be on its own line at the same indention level as the open curley.
> 
> Note this will cause all the code inside the new curleys to need to
> be reindented as well.

I know! But look at the code around the macro I touched: It's all
formatted that way, so I decided to stay with that style. (As well as
the trailing '\' are indented all the way with spaces.)

  So... Rework it all to use common indention? Or change it only right
here? Or propose another patch changing it to the usual indention style?

MfG, JBG
Jeff Law - Dec. 6, 2013, 3:49 a.m.
On 12/05/13 14:33, Jan-Benedict Glaw wrote:
> On Thu, 2013-12-05 14:22:46 -0700, Jeff Law <law@redhat.com> wrote:
>> On 12/05/13 14:17, Jan-Benedict Glaw wrote:
>>> diff --git a/gcc/config/score/score.h b/gcc/config/score/score.h
>>> index 5ab7875..e3bb7f0 100644
>>> --- a/gcc/config/score/score.h
>>> +++ b/gcc/config/score/score.h
>>> @@ -757,11 +757,12 @@ typedef struct score_args
>>>      entries PC-relative in GP-relative when .gp(d)word is supported.  */
>>>   #define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)                \
>>>     do {                                                                    \
>>> -    if (TARGET_SCORE7)                                                    \
>>> +    if (TARGET_SCORE7) {                                                  \
>>>         if (flag_pic)                                                       \
>>>           fprintf (STREAM, "\t.gpword %sL%d\n", LOCAL_LABEL_PREFIX, VALUE); \
>>>         else                                                                \
>>>           fprintf (STREAM, "\t.word %sL%d\n", LOCAL_LABEL_PREFIX, VALUE);   \
>>> +    }                                                                     \
>>>     } while (0)
>>>
>>>   /* Jump table alignment is explicit in ASM_OUTPUT_CASE_LABEL.  */
>> Formatting nit.  The open curley should be on its own line, indented
>> 2 spaces relative to its conditional.  Its close paren should also
>> be on its own line at the same indention level as the open curley.
>>
>> Note this will cause all the code inside the new curleys to need to
>> be reindented as well.
>
> I know! But look at the code around the macro I touched: It's all
> formatted that way, so I decided to stay with that style. (As well as
> the trailing '\' are indented all the way with spaces.)
>
>    So... Rework it all to use common indention? Or change it only right
> here? Or propose another patch changing it to the usual indention style?
I'd just change this one to be correct for the GNU style.  If you wanted 
to follow-up with another patch to fix these throughout the port, that'd 
be appreciated.

jeff

Patch

diff --git a/gcc/config/score/score.c b/gcc/config/score/score.c
index 3fdf2ea..30b49ed 100644
--- a/gcc/config/score/score.c
+++ b/gcc/config/score/score.c
@@ -516,30 +516,6 @@  score_output_mi_thunk (FILE *file, tree thunk_fndecl ATTRIBUTE_UNUSED,
   reload_completed = 0;
 }
 
-/* Copy VALUE to a register and return that register.  If new psuedos
-   are allowed, copy it into a new register, otherwise use DEST.  */
-static rtx
-score_force_temporary (rtx dest, rtx value)
-{
-  if (can_create_pseudo_p ())
-    return force_reg (Pmode, value);
-  else
-    {
-      emit_move_insn (copy_rtx (dest), value);
-      return dest;
-    }
-}
-
-/* Return a LO_SUM expression for ADDR.  TEMP is as for score_force_temporary
-   and is used to load the high part into a register.  */
-static rtx
-score_split_symbol (rtx temp, rtx addr)
-{
-  rtx high = score_force_temporary (temp,
-                                     gen_rtx_HIGH (Pmode, copy_rtx (addr)));
-  return gen_rtx_LO_SUM (Pmode, high, addr);
-}
-
 /* Fill INFO with information about a single argument.  CUM is the
    cumulative state for earlier arguments.  MODE is the mode of this
    argument and TYPE is its type (if known).  NAMED is true if this
diff --git a/gcc/config/score/score.h b/gcc/config/score/score.h
index 5ab7875..e3bb7f0 100644
--- a/gcc/config/score/score.h
+++ b/gcc/config/score/score.h
@@ -757,11 +757,12 @@  typedef struct score_args
    entries PC-relative in GP-relative when .gp(d)word is supported.  */
 #define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)                \
   do {                                                                    \
-    if (TARGET_SCORE7)                                                    \
+    if (TARGET_SCORE7) {                                                  \
       if (flag_pic)                                                       \
         fprintf (STREAM, "\t.gpword %sL%d\n", LOCAL_LABEL_PREFIX, VALUE); \
       else                                                                \
         fprintf (STREAM, "\t.word %sL%d\n", LOCAL_LABEL_PREFIX, VALUE);   \
+    }                                                                     \
   } while (0)
 
 /* Jump table alignment is explicit in ASM_OUTPUT_CASE_LABEL.  */