From 046b71ed34e2a816d14c89ddfe1607b4e8dc4803 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sun, 9 Dec 2001 15:50:13 +0000 Subject: [PATCH] 3b1.h (ASM_OUTPUT_ALIGN): Wrap in do-while(0). * m68k/3b1.h (ASM_OUTPUT_ALIGN): Wrap in do-while(0). * m68k/amix.h (ASM_GENERATE_INTERNAL_LABEL): Likewise. * m68k/atari.h (ASM_GENERATE_INTERNAL_LABEL): Likewise. * m68k/hp320.h (ASM_OUTPUT_ALIGN): Likewise. * m68k/m68kelf.h (ASM_OUTPUT_ALIGN): Likewise. * m68k/sgs.h (ASM_OUTPUT_ALIGN): Likewise. * m68k/tower-as.h (ASM_OUTPUT_ALIGN): Likewise. From-SVN: r47810 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/m68k/3b1.h | 4 +++- gcc/config/m68k/amix.h | 6 ++++-- gcc/config/m68k/atari.h | 4 +++- gcc/config/m68k/hp320.h | 4 +++- gcc/config/m68k/m68kelf.h | 4 +++- gcc/config/m68k/sgs.h | 4 +++- gcc/config/m68k/tower-as.h | 4 +++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 490a579a36f..558ca3c8294 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2001-12-09 Kaveh R. Ghazi + + * m68k/3b1.h (ASM_OUTPUT_ALIGN): Wrap in do-while(0). + * m68k/amix.h (ASM_GENERATE_INTERNAL_LABEL): Likewise. + * m68k/atari.h (ASM_GENERATE_INTERNAL_LABEL): Likewise. + * m68k/hp320.h (ASM_OUTPUT_ALIGN): Likewise. + * m68k/m68kelf.h (ASM_OUTPUT_ALIGN): Likewise. + * m68k/sgs.h (ASM_OUTPUT_ALIGN): Likewise. + * m68k/tower-as.h (ASM_OUTPUT_ALIGN): Likewise. + 2001-12-08 Tom Rix * config/rs6000/aix43.h (NON_POWERPC_MASKS): Delete MASK_STRING. diff --git a/gcc/config/m68k/3b1.h b/gcc/config/m68k/3b1.h index 343114128b5..936a173c9dd 100644 --- a/gcc/config/m68k/3b1.h +++ b/gcc/config/m68k/3b1.h @@ -151,10 +151,12 @@ do { long l; \ } while (0) #define ASM_OUTPUT_ALIGN(FILE,LOG) \ +do { \ if ((LOG) == 1) \ fprintf (FILE, "\teven\n"); \ else if ((LOG) != 0) \ - abort (); + abort (); \ +} while (0) /* This is how to output an assembler line that says to advance the location counter by SIZE bytes. */ diff --git a/gcc/config/m68k/amix.h b/gcc/config/m68k/amix.h index 1fbdcc3d7f3..0d440de0e70 100644 --- a/gcc/config/m68k/amix.h +++ b/gcc/config/m68k/amix.h @@ -136,10 +136,12 @@ do { \ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM) \ +do { \ if (flag_pic && !strcmp(PREFIX,"LC")) \ - sprintf (LABEL, "*%s%%%ld", PREFIX, (long)(NUM)); \ + sprintf (LABEL, "*%s%%%ld", PREFIX, (long)(NUM)); \ else \ - sprintf (LABEL, "*%s%s%ld", LOCAL_LABEL_PREFIX, PREFIX, (long)(NUM)) + sprintf (LABEL, "*%s%s%ld", LOCAL_LABEL_PREFIX, PREFIX, (long)(NUM)); \ +} while (0) #undef ASM_OUTPUT_INTERNAL_LABEL #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \ diff --git a/gcc/config/m68k/atari.h b/gcc/config/m68k/atari.h index 8e1ddff9a7e..75511ece43c 100644 --- a/gcc/config/m68k/atari.h +++ b/gcc/config/m68k/atari.h @@ -93,10 +93,12 @@ int switch_table_difference_label_flag; #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM) \ +do { \ if (flag_pic && !strcmp(PREFIX,"LC")) \ sprintf (LABEL, "*%s%%%ld", PREFIX, (long)(NUM)); \ else \ - sprintf (LABEL, "*%s%s%ld", LOCAL_LABEL_PREFIX, PREFIX, (long)(NUM)) + sprintf (LABEL, "*%s%s%ld", LOCAL_LABEL_PREFIX, PREFIX, (long)(NUM)); \ +} while (0) #undef ASM_OUTPUT_INTERNAL_LABEL #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \ diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h index 03617b43074..17d9d6a0b32 100644 --- a/gcc/config/m68k/hp320.h +++ b/gcc/config/m68k/hp320.h @@ -317,10 +317,12 @@ do { long l[3]; \ fprintf (FILE, "\tshort L%d-L%d\n", VALUE, REL) #define ASM_OUTPUT_ALIGN(FILE,LOG) \ +do { \ if ((LOG) == 1) \ fprintf (FILE, "\tlalign 2\n"); \ else if ((LOG) != 0) \ - abort (); + abort (); \ +} while (0) #define ASM_OUTPUT_SKIP(FILE,SIZE) \ fprintf (FILE, "\tspace %u\n", (SIZE)) diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h index 060b13bfc50..ae47c195dfe 100644 --- a/gcc/config/m68k/m68kelf.h +++ b/gcc/config/m68k/m68kelf.h @@ -98,10 +98,12 @@ Boston, MA 02111-1307, USA. */ #undef ASM_OUTPUT_ALIGN #define ASM_OUTPUT_ALIGN(FILE,LOG) \ +do { \ if ((LOG) > 0) \ fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG)); \ else if ((LOG) > 31) \ - abort (); + abort (); \ +} while (0) /* Use proper assembler syntax for these macros. */ #undef ASM_OUTPUT_REG_PUSH diff --git a/gcc/config/m68k/sgs.h b/gcc/config/m68k/sgs.h index 0c5eb596d1f..6f30ee1bba2 100644 --- a/gcc/config/m68k/sgs.h +++ b/gcc/config/m68k/sgs.h @@ -143,10 +143,12 @@ do { long l; \ #undef ASM_OUTPUT_ALIGN #define ASM_OUTPUT_ALIGN(FILE,LOG) \ +do { \ if ((LOG) > 0) \ fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG)); \ else if ((LOG) > 31) \ - abort (); + abort (); \ +} while (0) /* The routine used to output null terminated string literals. We cannot use the ".string" pseudo op, because it silently truncates strings to diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h index 6dd60dc5ee5..5b491af66da 100644 --- a/gcc/config/m68k/tower-as.h +++ b/gcc/config/m68k/tower-as.h @@ -314,10 +314,12 @@ do { long l; \ #undef ASM_OUTPUT_ALIGN #define ASM_OUTPUT_ALIGN(FILE,LOG) \ +do { \ if ((LOG) == 1) \ fprintf (FILE, "\teven\n"); \ else if ((LOG) != 0) \ - abort (); + abort (); \ +} while (0) #undef ASM_OUTPUT_SKIP #define ASM_OUTPUT_SKIP(FILE,SIZE) \ -- 2.30.2