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 78cc7eaeadfbc4cedeed49bf509d466d2872a6bc..64022b01e98d0be6a4646a9e44c39d657958034d 100644 (file)
--- 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 047df9771b6549af46b819eb0749249ae557dbd0..96e8626c5cf11b47b8ced86f8f3db7cbcf914ec5 100644 (file)
--- 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);     \