From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 21 Jun 2017 14:55:40 +0000 (+0200)
Subject: * g++.dg/cpp0x/constexpr-cast.C: Adjust dg-error for ILP32.
X-Git-Tag: upstream/12.2.0~38648
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e9d501c7db51bb2fdbb3678db4f74ee6b73e3b8;p=platform%2Fupstream%2Fgcc.git

* g++.dg/cpp0x/constexpr-cast.C: Adjust dg-error for ILP32.

From-SVN: r249455
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e05fb26..a23b04c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp0x/constexpr-cast.C: Adjust dg-error for ILP32.
+
 2017-06-21  Tom de Vries  <tom@codesourcery.com>
 
 	* lib/profopt.exp (profopt-get-options): Support dg-add-options.
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-cast.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-cast.C
index a50e27b..e23d0d4 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-cast.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-cast.C
@@ -7,7 +7,7 @@ int i;
 // The following is accepted due to bug 49171.
 constexpr void *q = reinterpret_cast<void*>(&i);    // { dg-error "" "bug c++/49171" { xfail *-*-* } }
 
-constexpr void *r0 = reinterpret_cast<void*>(1);    // { dg-error "not a constant expression" }
+constexpr void *r0 = reinterpret_cast<void*>(1);    // { dg-error "not a constant expression|reinterpret_cast from integer to pointer" }
 constexpr void *r1 = reinterpret_cast<void*>(sizeof 'x');  // { dg-error ".reinterpret_cast<void\\*>\\(1\[ul\]\*\\). is not a constant expression" }
 
 template <class T>