From: Renlin Li Date: Wed, 14 Jan 2015 11:02:24 +0000 (+0000) Subject: [ARM]Fix definition of __ARM_SIZEOF_WCHAR_T. X-Git-Tag: releases/gcc-4.8.5~326 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7632a86162a087b590d7d815c6de67079c51b3dd;p=thirdparty%2Fgcc.git [ARM]Fix definition of __ARM_SIZEOF_WCHAR_T. Backport from mainline: 2014-08-12 Ramana Radhakrishnan 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 329cc78962ad..619d69f24e13 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2015-01-14 Renlin Li + + Backport form mainline + 2014-08-12 Ramana Radhakrishnan + + PR target/61413 + * config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Fix definition + of __ARM_SIZEOF_WCHAR_T. + 2015-01-13 Pat Haugen Backport from mainline diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index b4947cd51d7b..d86eef7d7d28 100644 --- 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); \