From: Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
Date: Tue, 12 Aug 2014 14:59:23 +0000 (+0000)
Subject: re PR target/61413 (__ARM_SIZEOF_WCHAR_T is constant 32 -- should be 4 or 2)
X-Git-Tag: releases/gcc-5.1.0~5535
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e19707f507aff310e27e742c064d614326600d68;p=thirdparty%2Fgcc.git

re PR target/61413 (__ARM_SIZEOF_WCHAR_T is constant 32 -- should be 4 or 2)

Fix PR target/61413


2014-08-12  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

	PR target/61413
	* config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Fix definition
	of __ARM_SIZEOF_WCHAR_T.

From-SVN: r213864
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 78cc7eaeadfb..64022b01e98d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-12  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+	PR target/61413
+	* config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Fix definition
+	of __ARM_SIZEOF_WCHAR_T.
+
 2014-08-12  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
 	PR target/62098
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 047df9771b65..96e8626c5cf1 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -74,8 +74,8 @@ extern char arm_arch_name[];
 	builtin_define_with_int_value (				\
 	  "__ARM_SIZEOF_MINIMAL_ENUM",				\
 	  flag_short_enums ? 1 : 4);				\
-	builtin_define_with_int_value (				\
-	  "__ARM_SIZEOF_WCHAR_T", WCHAR_TYPE_SIZE);		\
+	builtin_define_type_sizeof ("__ARM_SIZEOF_WCHAR_T",	\
+				    wchar_type_node);		\
 	if (TARGET_ARM_ARCH_PROFILE)				\
 	  builtin_define_with_int_value (			\
 	    "__ARM_ARCH_PROFILE", TARGET_ARM_ARCH_PROFILE);	\