AAPCS compliance - 32-bit wchar_t should be unsigned for both aapcs and aapcs-linux.

Original behaviour of defining wchar_t as signed int has been kept for apcs-gnu as I don't have any spec for this to validate against.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145102 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 06e79261e9c98c7796e1893dff28100b639dfef4..1dcdf93ba70e790be689bc4aee7ae4dd06dc0440 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -2404,6 +2404,8 @@ public:
   {
     SizeType = UnsignedInt;
     PtrDiffType = SignedInt;
+    // AAPCS 7.1.1, ARM-Linux ABI 2.4: type of wchar_t is unsigned int.
+    WCharType = UnsignedInt;
 
     // {} in inline assembly are neon specifiers, not assembly variant
     // specifiers.
@@ -2442,6 +2444,9 @@ public:
       DoubleAlign = LongLongAlign = LongDoubleAlign = 32;
       SizeType = UnsignedLong;
 
+      // Revert to using SignedInt on apcs-gnu to comply with existing behaviour.
+      WCharType = SignedInt;
+
       // Do not respect the alignment of bit-field types when laying out
       // structures. This corresponds to PCC_BITFIELD_TYPE_MATTERS in gcc.
       UseBitFieldTypeAlignment = false;

diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 24ebeb6ac7c48577ddce318afff4d22c64911096..ec90d6a3bb5247820768e34be0d137707d4ca516 100644 (file)
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -212,8 +212,8 @@
 // ARM:#define __THUMB_INTERWORK__ 1
 // ARM:#define __UINTMAX_TYPE__ long long unsigned int
 // ARM:#define __USER_LABEL_PREFIX__ _
-// ARM:#define __WCHAR_MAX__ 2147483647
-// ARM:#define __WCHAR_TYPE__ int
+// ARM:#define __WCHAR_MAX__ 4294967295U
+// ARM:#define __WCHAR_TYPE__ unsigned int
 // ARM:#define __WCHAR_WIDTH__ 32
 // ARM:#define __WINT_TYPE__ int
 // ARM:#define __WINT_WIDTH__ 32

diff --git a/test/Preprocessor/stdint.c b/test/Preprocessor/stdint.c
index fc88688b525a7226f3901860755998de7302e800..70c106bf7974003dc43d42fbcb064a231ce3bdfd 100644 (file)
--- a/test/Preprocessor/stdint.c
+++ b/test/Preprocessor/stdint.c
@@ -90,8 +90,8 @@
 // ARM:WINT_MIN_ (-2147483647 -1)
 // ARM:WINT_MAX_ 2147483647
 //
-// ARM:WCHAR_MAX_ 2147483647
-// ARM:WCHAR_MIN_ (-2147483647 -1)
+// ARM:WCHAR_MAX_ 4294967295U
+// ARM:WCHAR_MIN_ 0U
 //
 // ARM:INT8_C_(0) 0
 // ARM:UINT8_C_(0) 0U