Hi,

this patch removes a semicolon after ASM_OUTPUT_BEFORE_CASE_LABEL macro bodies. This allows the macro to be used in if-then-elses without curly braces.

Bootstrapped and reg-tested on x86_64.

Committed as obvious.

Thanks,
- Tom

2017-11-02  Tom de Vries  <t...@codesourcery.com>

        PR other/82784
        * config/elfos.h (ASM_OUTPUT_BEFORE_CASE_LABEL): Remove
        semicolon after macro body.
        (ASM_OUTPUT_CASE_LABEL): Add semicolon after
        ASM_OUTPUT_BEFORE_CASE_LABEL call.
        * config/arc/arc.h (ASM_OUTPUT_BEFORE_CASE_LABEL): Remove
        semicolon after macro body.
        * config/m68k/m68kelf.h (ASM_OUTPUT_BEFORE_CASE_LABEL): Same.
        * config/mips/mips.h (ASM_OUTPUT_BEFORE_CASE_LABEL): Same.
        * config/v850/v850.h (ASM_OUTPUT_BEFORE_CASE_LABEL): Same.

Signed-off-by: Tom de Vries <t...@codesourcery.com>
---
       gcc/config/arc/arc.h      | 2 +-
       gcc/config/elfos.h        | 6 +++---
       gcc/config/m68k/m68kelf.h | 2 +-
       gcc/config/mips/mips.h    | 2 +-
       gcc/config/v850/v850.h    | 2 +-
       5 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h
index 1d9063a..ec28d61 100644
--- a/gcc/config/arc/arc.h
+++ b/gcc/config/arc/arc.h
@@ -1405,7 +1405,7 @@ do { \
   (exact_log2 (GET_MODE_SIZE (GET_MODE (PATTERN (VEC_INSN)))))
 #undef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE, PREFIX, NUM, TABLE) \
-  ASM_OUTPUT_ALIGN ((FILE), ADDR_VEC_ALIGN (TABLE));
+  ASM_OUTPUT_ALIGN ((FILE), ADDR_VEC_ALIGN (TABLE))
 
 #define INSN_LENGTH_ALIGNMENT(INSN)		  \
   ((JUMP_TABLE_DATA_P (INSN)			  \
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index 47a0711..0f79de7 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -135,15 +135,15 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 #ifndef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE, PREFIX, NUM, TABLE) \
-  ASM_OUTPUT_ALIGN ((FILE), 2);
+  ASM_OUTPUT_ALIGN ((FILE), 2)
 #endif
 
 #undef  ASM_OUTPUT_CASE_LABEL
 #define ASM_OUTPUT_CASE_LABEL(FILE, PREFIX, NUM, JUMPTABLE)		\
   do									\
     {									\
-      ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE)	\
-	(*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);			\
+      ASM_OUTPUT_BEFORE_CASE_LABEL (FILE, PREFIX, NUM, JUMPTABLE);	\
+      (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);		\
     }									\
   while (0)
 
diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h
index 159223f..408eec8 100644
--- a/gcc/config/m68k/m68kelf.h
+++ b/gcc/config/m68k/m68kelf.h
@@ -133,7 +133,7 @@ do {								\
    table.  */
 #undef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE)		\
-  fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1));
+  fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1))
 /* end of stuff from m68kv4.h */
 
 #undef ENDFILE_SPEC
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index f5c28bf..d7f86b6 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -2953,7 +2953,7 @@ do {									\
       if (JUMP_TABLES_IN_TEXT_SECTION)					\
 	mips_set_text_contents_type (STREAM, "__jump_", NUM, FALSE);	\
     }									\
-  while (0);
+  while (0)
 
 /* Reset text marking to code after an inline jump table.  Like with
    the beginning of a jump table use the label number to keep symbols
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 5eb2e88..54dcc09 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -743,7 +743,7 @@ typedef enum
 
 #undef ASM_OUTPUT_BEFORE_CASE_LABEL
 #define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE) \
-  ASM_OUTPUT_ALIGN ((FILE), (TARGET_BIG_SWITCH ? 2 : 1));
+  ASM_OUTPUT_ALIGN ((FILE), (TARGET_BIG_SWITCH ? 2 : 1))
 
 #define WORD_REGISTER_OPERATIONS 1
 







Reply via email to