From fe1814cf8401eb2cdc54ce76838bd5996d9d6e70 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 12 May 2015 21:11:13 -0400
Subject: [PATCH] mmix.c, msp430.c: Add space between string literal and macro
 name.

gcc/
	* config/mmix/mmix.c, config/msp430/msp430.c: Add space between
	string literal and macro name.
gcc/ada/
	* sigtramp-vxworks.c: Add space between string literal and macro
	name.

From-SVN: r223106
---
 gcc/ChangeLog              | 5 +++++
 gcc/ada/ChangeLog          | 5 +++++
 gcc/ada/sigtramp-vxworks.c | 6 +++---
 gcc/config/mmix/mmix.c     | 6 +++---
 gcc/config/msp430/msp430.c | 2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc07c1db1989..10b8fdd74902 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-12  Jason Merrill  <jason@redhat.com>
+
+	* config/mmix/mmix.c, config/msp430/msp430.c: Add space between
+	string literal and macro name.
+
 2015-05-12  Steve Ellcey  <sellcey@imgtec.com>
 
 	* config/mips/mips.c (mips_print_operand): Remove 'y' operand code.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 50c83deaf4e6..6df8f508ac66 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-12  Jason Merrill  <jason@redhat.com>
+
+	* sigtramp-vxworks.c: Add space between string literal and macro
+	name.
+
 2015-05-12  Arnaud Charlet  <charlet@adacore.com>
 
 	* gnat_rm.texi, gnat_ugn.texi, doc: Documentation updates and clean ups
diff --git a/gcc/ada/sigtramp-vxworks.c b/gcc/ada/sigtramp-vxworks.c
index 2119296dc1d7..c697626a03e2 100644
--- a/gcc/ada/sigtramp-vxworks.c
+++ b/gcc/ada/sigtramp-vxworks.c
@@ -342,16 +342,16 @@ CR("") \
 TCR("# Allocate frame and save the non-volatile") \
 TCR("# registers we're going to modify") \
 TCR("mov	ip, sp") \
-TCR("stmfd	sp!, {r"S(CFA_REG)", fp, ip, lr, pc}") \
+TCR("stmfd	sp!, {r" S(CFA_REG)", fp, ip, lr, pc}") \
 TCR("# Setup CFA_REG = context, which we'll retrieve as our CFA value") \
-TCR("ldr	r"S(CFA_REG)", [ip]") \
+TCR("ldr	r" S(CFA_REG)", [ip]") \
 TCR("")                 \
 TCR("# Call the real handler. The signo, siginfo and sigcontext") \
 TCR("# arguments are the same as those we received in r0, r1 and r2") \
 TCR("sub	fp, ip, #4") \
 TCR("blx	r3") \
 TCR("# Restore our callee-saved items, release our frame and return") \
-TCR("ldmfd	sp, {r"S(CFA_REG)", fp, sp, pc}")
+TCR("ldmfd	sp, {r" S(CFA_REG)", fp, sp, pc}")
 
 #else
 Not_implemented;
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 6e991207dbc0..e0699854e257 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -2520,7 +2520,7 @@ mmix_output_shiftvalue_op_from_str (FILE *stream,
   if (! mmix_shiftable_wyde_value (value))
     {
       char s[sizeof ("0xffffffffffffffff")];
-      sprintf (s, "%#"PRIx64, value);
+      sprintf (s, "%#" PRIx64, value);
       internal_error ("MMIX Internal: %s is not a shiftable int", s);
     }
 
@@ -2562,7 +2562,7 @@ mmix_output_octa (FILE *stream, int64_t value, int do_begin_end)
     fprintf (stream, "#" HOST_WIDE_INT_PRINT_HEX_PURE,
 	     (HOST_WIDE_INT) value);
   else /* Need to avoid the hex output; there's no ...WIDEST...HEX_PURE.  */
-    fprintf (stream, "%"PRIu64, value);
+    fprintf (stream, "%" PRIu64, value);
 
   if (do_begin_end)
     fprintf (stream, "\n");
@@ -2579,7 +2579,7 @@ mmix_output_shifted_value (FILE *stream, int64_t value)
   if (! mmix_shiftable_wyde_value (value))
     {
       char s[16+2+1];
-      sprintf (s, "%#"PRIx64, value);
+      sprintf (s, "%#" PRIx64, value);
       internal_error ("MMIX Internal: %s is not a shiftable int", s);
     }
 
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index bec168ca2ae2..58d0efea1dec 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -2248,7 +2248,7 @@ static struct
 }
   const_shift_helpers[] =
 {
-#define CSH(N,C,X,G) { "__mspabi_"N, C, X, gen_##G }
+#define CSH(N,C,X,G) { "__mspabi_" N, C, X, gen_##G }
 
   CSH ("slli", 1, 1, slli_1),
   CSH ("slll", 1, 1, slll_1),
-- 
GitLab