From patchwork Wed May 18 18:36:44 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Uros Bizjak <ubizjak@gmail.com>
X-Patchwork-Id: 96214
Return-Path: 
 <gcc-patches-return-292141-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 5F36D1007DC
	for <incoming@patchwork.ozlabs.org>;
	Thu, 19 May 2011 04:37:01 +1000 (EST)
Received: (qmail 32549 invoked by alias); 18 May 2011 18:36:59 -0000
Received: (qmail 32433 invoked by uid 22791); 18 May 2011 18:36:59 -0000
X-SWARE-Spam-Status: No, hits=-2.2 required=5.0	tests=AWL, BAYES_00,
	DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM,
	RCVD_IN_DNSWL_LOW, RFC_ABUSE_POST, TW_ZJ,
	T_TO_NO_BRKTS_FREEMAIL
X-Spam-Check-By: sourceware.org
Received: from mail-pz0-f47.google.com (HELO mail-pz0-f47.google.com)
	(209.85.210.47) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Wed, 18 May 2011 18:36:45 +0000
Received: by pzk36 with SMTP id 36so918494pzk.20 for
	<gcc-patches@gcc.gnu.org>; Wed, 18 May 2011 11:36:44 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.142.249.39 with SMTP id w39mr1243296wfh.96.1305743804220;
	Wed, 18 May 2011 11:36:44 -0700 (PDT)
Received: by 10.142.108.7 with HTTP; Wed, 18 May 2011 11:36:44 -0700 (PDT)
Date: Wed, 18 May 2011 20:36:44 +0200
Message-ID: <BANLkTinqRu+2UzMVJEmqGA7WOfPRizyzUA@mail.gmail.com>
Subject: [PATCH, ming32]: Fix OUTPUT_QUOTED_STRING macro argument expansion
From: Uros Bizjak <ubizjak@gmail.com>
To: gcc-patches@gcc.gnu.org
Cc: Kai Tietz <ktietz70@googlemail.com>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hello!

This macro compiles by pure luck.

2011-05-18  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/mingw32.h (OUTPUT_QUOTED_STRING): Fix macro
	argument expansion.

Patch was compile tested by crosscompiling to ming32 target.

OK for mainline?

Uros.

Index: mingw32.h
===================================================================
--- mingw32.h	(revision 173864)
+++ mingw32.h	(working copy)
@@ -160,11 +160,12 @@ along with GCC; see the file COPYING3.  
 #undef OUTPUT_QUOTED_STRING
 #define OUTPUT_QUOTED_STRING(FILE, STRING)               \
 do {						         \
+  const char *_string = (const char *) (STRING);	 \
   char c;					         \
 						         \
-  putc ('\"', asm_file);			         \
+  putc ('\"', (FILE));				         \
 						         \
-  while ((c = *string++) != 0)			         \
+  while ((c = *_string++) != 0)			         \
     {						         \
       if (c == '\\')				         \
 	c = '/';				         \
@@ -172,14 +173,14 @@ do {						         \
       if (ISPRINT (c))                                   \
         {                                                \
           if (c == '\"')			         \
-	    putc ('\\', asm_file);		         \
-          putc (c, asm_file);			         \
+	    putc ('\\', (FILE));		         \
+          putc (c, (FILE));			         \
         }                                                \
       else                                               \
-        fprintf (asm_file, "\\%03o", (unsigned char) c); \
+        fprintf ((FILE), "\\%03o", (unsigned char) c);	 \
     }						         \
 						         \
-  putc ('\"', asm_file);			         \
+  putc ('\"', (FILE));					 \
 } while (0)
 
 /* Define as short unsigned for compatibility with MS runtime.  */