On Thu, 2013-12-05 20:49:06 -0700, Jeff Law <l...@redhat.com> wrote:
> On 12/05/13 14:33, Jan-Benedict Glaw wrote:
> > On Thu, 2013-12-05 14:22:46 -0700, Jeff Law <l...@redhat.com> wrote:
> > > On 12/05/13 14:17, Jan-Benedict Glaw wrote:
[...]

> 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.


2013-12-06  Jan-Benedict Glaw  <jbg...@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 and reindent.

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..c6a2f34 100644
--- a/gcc/config/score/score.h
+++ b/gcc/config/score/score.h
@@ -755,13 +755,15 @@ typedef struct score_args
 /* Output of Dispatch Tables.  */
 /* This is how to output an element of a case-vector.  We can make the
    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 (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);   \
+#define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)                     
\
+  do {                                                                         
\
+    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.  */


I'll probably prepare another patch to fix indention for what's left.

MfG, JBG

-- 
      Jan-Benedict Glaw      jbg...@lug-owl.de              +49-172-7608481
 Signature of:                            If it doesn't work, force it.
 the second  :                   If it breaks, it needed replacing anyway.

Attachment: signature.asc
Description: Digital signature

Reply via email to