From: Marek Polacek <polacek@redhat.com>
Date: Tue, 18 Feb 2020 20:54:54 +0000 (-0500)
Subject: c++: Fix array-init1.C for ILP32 [PR93817]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b02719918d7bfa224b7caa38fdb9be095cd3f4ad;p=gcc.git

c++: Fix array-init1.C for ILP32 [PR93817]

I only tested LP64 targets and missed this maybe-long unsigned int.

Tested with
GXX_TESTSUITE_STDS=98,11,14,17,2a make check-c++ RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} dg.exp=array-init1.C'

2020-02-18  Marek Polacek  <polacek@redhat.com>

	PR c++/93817
	* g++.dg/diagnostic/array-init1.C: Fix for ILP32.
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a6c09acde85..600ac38efc8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-18  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/93817
+	* g++.dg/diagnostic/array-init1.C: Fix for ILP32.
+
 2020-02-18  Jon Beniston <jon@beniston.com>
 
 	* gcc.dg/strcmpopt_6.c: Add space in array for terminator.
diff --git a/gcc/testsuite/g++.dg/diagnostic/array-init1.C b/gcc/testsuite/g++.dg/diagnostic/array-init1.C
index 78580ad6b83..11b91ec355e 100644
--- a/gcc/testsuite/g++.dg/diagnostic/array-init1.C
+++ b/gcc/testsuite/g++.dg/diagnostic/array-init1.C
@@ -7,5 +7,5 @@ int x;
 A a1[] = {
   0L, // { dg-error "3:conversion from .long int. to .A. is ambiguous" }
   &x, // { dg-error "3:invalid conversion from .int\\*. to .int." }
-  __builtin_offsetof (A, i) // { dg-error "23:conversion from .long unsigned int. to .A. is ambiguous" }
+  __builtin_offsetof (A, i) // { dg-error "23:conversion from .\(long \)?unsigned int. to .A. is ambiguous" }
 };