From 69996ff69a8350886e8461c4894fd7e3127b18c8 Mon Sep 17 00:00:00 2001
From: rearnsha <rearnsha@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 24 Sep 2003 09:06:32 +0000
Subject: [PATCH] * arm.h (ASM_OUTPUT_REG_PUSH, ASM_OUTPUT_REG_POP): Wrap in
 do...while(0)

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71731 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog        |  5 +++++
 gcc/config/arm/arm.h | 28 +++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5204532f31f..7168de64776 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-24  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.h (ASM_OUTPUT_REG_PUSH, ASM_OUTPUT_REG_POP): Wrap in
+	do...while(0)
+
 2003-09-23  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* config.gcc: Move use_fixproto=no from generic vxworks clause to
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 958cbcb29f6..dc21b534e2e 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2409,19 +2409,25 @@ extern int making_const_table;
 
 /* Output a push or a pop instruction (only used when profiling).  */
 #define ASM_OUTPUT_REG_PUSH(STREAM, REGNO)		\
-  if (TARGET_ARM)					\
-    asm_fprintf (STREAM,"\tstmfd\t%r!,{%r}\n", 		\
-		 STACK_POINTER_REGNUM, REGNO);		\
-  else							\
-    asm_fprintf (STREAM, "\tpush {%r}\n", REGNO)
+  do							\
+    {							\
+      if (TARGET_ARM)					\
+	asm_fprintf (STREAM,"\tstmfd\t%r!,{%r}\n",	\
+		     STACK_POINTER_REGNUM, REGNO);	\
+      else						\
+	asm_fprintf (STREAM, "\tpush {%r}\n", REGNO);	\
+    } while (0)
 
 
 #define ASM_OUTPUT_REG_POP(STREAM, REGNO)		\
-  if (TARGET_ARM)					\
-    asm_fprintf (STREAM, "\tldmfd\t%r!,{%r}\n",		\
-                 STACK_POINTER_REGNUM, REGNO);		\
-  else							\
-    asm_fprintf (STREAM, "\tpop {%r}\n", REGNO)
+  do							\
+    {							\
+      if (TARGET_ARM)					\
+	asm_fprintf (STREAM, "\tldmfd\t%r!,{%r}\n",	\
+		     STACK_POINTER_REGNUM, REGNO);	\
+      else						\
+	asm_fprintf (STREAM, "\tpop {%r}\n", REGNO);	\
+    } while (0)
 
 /* This is how to output a label which precedes a jumptable.  Since
    Thumb instructions are 2 bytes, we may need explicit alignment here.  */
@@ -2431,7 +2437,7 @@ extern int making_const_table;
     {								\
       if (TARGET_THUMB)						\
         ASM_OUTPUT_ALIGN (FILE, 2);				\
-      (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);		\
+      (*targetm.asm_out.internal_label) (FILE, PREFIX, NUM);	\
     }								\
   while (0)
 
-- 
2.11.4.GIT