From: dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 18 Nov 2015 00:43:59 +0000 (+0000)
Subject:         * g++.dg/cpp1y/pr58708.C: Define wfoo based on sizeof wchar_t.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75e685eddc31039374915d69f9eeb0b40e2f1149;p=thirdparty%2Fgcc.git

    * g++.dg/cpp1y/pr58708.C: Define wfoo based on sizeof wchar_t.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230516 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a1f14587d274..0c7900e3cffb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-17  David Edelsohn  <dje.gcc@gmail.com>
+
+	* g++.dg/cpp1y/pr58708.C: Define wfoo based on sizeof wchar_t.
+
 2015-11-17  David Malcolm  <dmalcolm@redhat.com>
 
 	* gcc.dg/plugin/diagnostic-test-expressions-1.c (vector): New
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr58708.C b/gcc/testsuite/g++.dg/cpp1y/pr58708.C
index 6fc374f1e56a..3f39db8cfd48 100644
--- a/gcc/testsuite/g++.dg/cpp1y/pr58708.C
+++ b/gcc/testsuite/g++.dg/cpp1y/pr58708.C
@@ -43,7 +43,11 @@ main()
   if (foo.chars[1] != 98) __builtin_abort();
   if (foo.chars[2] != 99) __builtin_abort();
 
-  auto wfoo = L"\x01020304\x05060708"_foo;
+#if __SIZEOF_WCHAR_T__ == 2
+    auto wfoo = L"\x0102\x0304"_foo;
+#else
+    auto wfoo = L"\x01020304\x05060708"_foo;
+#endif
   if (is_same<decltype(wfoo)::char_type, wchar_t>::value != true) __builtin_abort();
   if (sizeof(wfoo.chars)/sizeof(wchar_t) != 2) __builtin_abort();
   if (wfoo.chars[0] != 16909060) __builtin_abort();