[ARM]Fix definition of __ARM_SIZEOF_WCHAR_T.

	Backport from mainline:
	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: r219587

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 329cc78962ad4992ddda28f3fe37e0ac71371235..619d69f24e13f1d714d9ba2c3f774262d5bdf9ff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-14  Renlin Li  <renlin.li@arm.com>
+
+       Backport form mainline
+       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.
+
 2015-01-13  Pat Haugen  <pthaugen@us.ibm.com>
 
        Backport from mainline

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index b4947cd51d7bdf01c146bfc5780fd75dea2bb2a0..d86eef7d7d281c148e0b683b63b3c987b6b7429e 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -63,8 +63,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);     \