* cppmacro.c (cpp_macro_definition): Do not emit spaces after

macro formal parameter names.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51890 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 4 deletions

diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 3ce44be504c..a022581f84f 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -1508,10 +1508,10 @@ cpp_macro_definition (pfile, node)
   len = NODE_LEN (node) + 1;			/* ' ' */
   if (macro->fun_like)
     {
-      len += 3;		/* "()" plus possible final "." of named
-			   varargs (we have + 2 below).  */
+      len += 4;		/* "()" plus possible final ".." of named
+			   varargs (we have + 1 below).  */
       for (i = 0; i < macro->paramc; i++)
-	len += NODE_LEN (macro->params[i]) + 2; /* ", " */
+	len += NODE_LEN (macro->params[i]) + 1; /* "," */
     }
 
   for (i = 0; i < macro->count; i++)
@@ -1554,7 +1554,10 @@ cpp_macro_definition (pfile, node)
 	    }
 
 	  if (i + 1 < macro->paramc)
-	    *buffer++ = ',', *buffer++ = ' ';
+            /* Don't emit a space after the comma here; we're trying
+               to emit a Dwarf-friendly definition, and the Dwarf spec
+               forbids spaces in the argument list.  */
+	    *buffer++ = ',';
 	  else if (macro->variadic)
 	    *buffer++ = '.', *buffer++ = '.', *buffer++ = '.';
 	}