From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 2 Sep 2009 17:35:30 +0000 (+0000)
Subject: libcpp/:
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=2a50bfcf98249aff98c8ad8383d0d419f06fd9b2

libcpp/:
	* macro.c (stringify_arg): Escape CPP_WCHAR tokens.
gcc/testsuite/:
	* gcc.dg/20090902-1.c: New test.


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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4f8f0cd6bd9..67c54c3efb6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-02  Ian Lance Taylor  <iant@google.com>
+
+	* gcc.dg/20090902-1.c: New test.
+
 2009-09-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.dg/builtin-object-size-9.c: New test.
diff --git a/gcc/testsuite/gcc.dg/20090902-1.c b/gcc/testsuite/gcc.dg/20090902-1.c
new file mode 100644
index 00000000000..6120ee90704
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20090902-1.c
@@ -0,0 +1,3 @@
+/* { dg-do compile } */
+#define STRING(x) #x
+char buf[] = STRING(L'\x123');
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index f76fa181dde..1b020ac0ab8 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-02  Ian Lance Taylor  <iant@google.com>
+
+	* macro.c (stringify_arg): Escape CPP_WCHAR tokens.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac (AC_PREREQ): Bump to 2.64.
diff --git a/libcpp/macro.c b/libcpp/macro.c
index e051fbc7757..f31805955c6 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -377,7 +377,7 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg)
 	}
 
       escape_it = (token->type == CPP_STRING || token->type == CPP_CHAR
-		   || token->type == CPP_WSTRING || token->type == CPP_STRING
+		   || token->type == CPP_WSTRING || token->type == CPP_WCHAR
 		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
 		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16);