From patchwork Thu May  7 10:41:13 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Marek Polacek <polacek@redhat.com>
X-Patchwork-Id: 469593
Return-Path: 
 <gcc-patches-return-397095-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
	bits)) (No client certificate requested)
	by ozlabs.org (Postfix) with ESMTPS id B6EE114010F
	for <incoming@patchwork.ozlabs.org>;
	Thu,  7 May 2015 20:41:32 +1000 (AEST)
Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
	unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org
	header.b=Jiq7SjfW; dkim-atps=neutral
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:cc:subject:message-id:mime-version:content-type; q=dns;
	s=default; b=JZNHMNwcrMTjKZjHtxtzhhXhlXVGPCh+kwMUsLo0+wouzqLAk8
	8+b3w4ag0QrH4fzqY9+l7nNqDr2WCSxGGKB7vq4oIHaPkmC26HJLc9Cwu7Q3JMXA
	35NyvKcQCd9DTtjkNtwFu0UklXGIxecMFjbsuMVqVnXcPUkC9+Kbi0W9o=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:date
	:from:to:cc:subject:message-id:mime-version:content-type; s=
	default; bh=hcOQ4vGAURh3TsSWoVdzjfq1q7o=; b=Jiq7SjfWd7fw/Em1sPgM
	zf6+5oWMDGO6osVeFjbNtNcIdfQQaX7FBFAgKplFnMUgq1m0GtUbxL2zjW/l0m3/
	AmFnCaZg0QXDUX/wBYYMJ+04wdNbgfACxLbrXP7chpAKPzMqn4nD6bN44SZag3yq
	QXm760asv5K8rKwEt8IU1NA=
Received: (qmail 112335 invoked by alias); 7 May 2015 10:41:24 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org
Received: (qmail 112316 invoked by uid 89); 7 May 2015 10:41:23 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_50,
	SPF_HELO_PASS, SPF_PASS,
	T_RP_MATCHES_RCVD autolearn=ham version=3.3.2
X-HELO: mx1.redhat.com
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by
	sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with
	(AES256-GCM-SHA384 encrypted) ESMTPS;
	Thu, 07 May 2015 10:41:19 +0000
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])	by
	mx1.redhat.com (Postfix) with ESMTPS id 758518E798;
	Thu,  7 May 2015 10:41:18 +0000 (UTC)
Received: from redhat.com (ovpn-204-66.brq.redhat.com [10.40.204.66])	by
	int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4)
	with ESMTP id t47AfDxb010992	(version=TLSv1/SSLv3
	cipher=AES256-SHA bits=256 verify=NO);
	Thu, 7 May 2015 06:41:16 -0400
Date: Thu, 7 May 2015 12:41:13 +0200
From: Marek Polacek <polacek@redhat.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>, Yury Gribov <y.gribov@samsung.com>,
	Maxim Ostapenko <m.ostapenko@partner.samsung.com>
Cc: Jakub Jelinek <jakub@redhat.com>
Subject: Fix ubsan tests on ARM (PR testsuite/66046)
Message-ID: <20150507104113.GB3384@redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)

Trailing \[^\n\r]*(\n|\r\n|\r) in the last dg-output aroused dismay on ARM.

Here's a patch to clean this up; can you please test this on ARM?

make check-g{cc,++} RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} ubsan.exp'
passes on x86_64-linux.

2015-05-07  Marek Polacek  <polacek@redhat.com>

	PR testsuite/66046
	* c-c++-common/ubsan/align-6.c: Don't match trailing newlines in the
	last dg-output.
	* c-c++-common/ubsan/align-7.c: Likewise.
	* c-c++-common/ubsan/bounds-8.c: Likewise.
	* c-c++-common/ubsan/float-cast-overflow-9.c: Likewise.
	* c-c++-common/ubsan/load-bool-enum.c: Likewise.
	* c-c++-common/ubsan/null-1.c: Likewise.
	* c-c++-common/ubsan/null-10.c: Likewise.
	* c-c++-common/ubsan/null-11.c: Likewise.
	* c-c++-common/ubsan/null-2.c: Likewise.
	* c-c++-common/ubsan/null-3.c: Likewise.
	* c-c++-common/ubsan/null-4.c: Likewise.
	* c-c++-common/ubsan/null-5.c: Likewise.
	* c-c++-common/ubsan/null-6.c: Likewise.
	* c-c++-common/ubsan/null-7.c: Likewise.
	* c-c++-common/ubsan/null-8.c: Likewise.
	* c-c++-common/ubsan/null-9.c: Likewise.
	* c-c++-common/ubsan/object-size-1.c: Likewise.
	* c-c++-common/ubsan/object-size-10.c: Likewise.
	* c-c++-common/ubsan/object-size-4.c: Likewise.
	* c-c++-common/ubsan/object-size-5.c: Likewise.
	* c-c++-common/ubsan/object-size-7.c: Likewise.
	* c-c++-common/ubsan/object-size-8.c: Likewise.
	* c-c++-common/ubsan/object-size-9.c: Likewise.
	* c-c++-common/ubsan/overflow-add-2.c: Likewise.
	* c-c++-common/ubsan/overflow-int128.c: Likewise.
	* c-c++-common/ubsan/overflow-mul-2.c: Likewise.
	* c-c++-common/ubsan/overflow-mul-4.c: Likewise.
	* c-c++-common/ubsan/overflow-negate-1.c: Likewise.
	* c-c++-common/ubsan/overflow-negate-3.c: Likewise.
	* c-c++-common/ubsan/overflow-sub-2.c: Likewise.
	* c-c++-common/ubsan/overflow-sub-4.c: Likewise.
	* c-c++-common/ubsan/pr59333.c: Likewise.
	* c-c++-common/ubsan/pr59667.c: Likewise.
	* c-c++-common/ubsan/pr60613-2.c: Likewise.
	* c-c++-common/ubsan/pr60636.c: Likewise.
	* c-c++-common/ubsan/pr63802.c: Likewise.
	* c-c++-common/ubsan/recovery-1.c: Likewise.
	* c-c++-common/ubsan/recovery-3.c: Likewise.
	* c-c++-common/ubsan/shift-1.c: Likewise.
	* c-c++-common/ubsan/shift-2.c: Likewise.
	* c-c++-common/ubsan/shift-4.c: Likewise.
	* c-c++-common/ubsan/shift-7.c: Likewise.
	* c-c++-common/ubsan/undefined-2.c: Likewise.
	* c-c++-common/ubsan/vla-1.c: Likewise.
	* g++.dg/ubsan/null-1.C: Likewise.
	* g++.dg/ubsan/null-3.C: Likewise.
	* g++.dg/ubsan/null-4.C: Likewise.
	* g++.dg/ubsan/vptr-8.C: Likewise.
	* g++.dg/ubsan/vptr-9.C: Likewise.
	* gcc.dg/ubsan/bounds-2.c: Likewise.
	* gcc.dg/ubsan/object-size-9.c: Likewise.


	Marek

diff --git gcc/testsuite/c-c++-common/ubsan/align-6.c gcc/testsuite/c-c++-common/ubsan/align-6.c
index 5521292..3364746 100644
--- gcc/testsuite/c-c++-common/ubsan/align-6.c
+++ gcc/testsuite/c-c++-common/ubsan/align-6.c
@@ -30,4 +30,4 @@ main ()
 /* { dg-output "\.c:15:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
 /* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
 /* { dg-output "\.c:17:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
-/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
+/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment" } */
diff --git gcc/testsuite/c-c++-common/ubsan/align-7.c gcc/testsuite/c-c++-common/ubsan/align-7.c
index 68c9135..b441ef6 100644
--- gcc/testsuite/c-c++-common/ubsan/align-7.c
+++ gcc/testsuite/c-c++-common/ubsan/align-7.c
@@ -28,6 +28,6 @@ main ()
   return 0;
 }
 
-/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment.*" } */
+/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment" } */
 /* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
 /* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git gcc/testsuite/c-c++-common/ubsan/bounds-8.c gcc/testsuite/c-c++-common/ubsan/bounds-8.c
index 9a1b1d2..20f9382 100644
--- gcc/testsuite/c-c++-common/ubsan/bounds-8.c
+++ gcc/testsuite/c-c++-common/ubsan/bounds-8.c
@@ -10,4 +10,4 @@ main (void)
   (*a)[2] = 1;
 }
 
-/* { dg-output "index 2 out of bounds for type 'int \\\[1\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "index 2 out of bounds for type 'int \\\[1\\\]'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-9.c gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-9.c
index 05399e7..202ce7d 100644
--- gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-9.c
+++ gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-9.c
@@ -58,4 +58,4 @@
 /* { dg-output "\[^\n\r]*value <unknown> is outside the range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" { target int128 } } */
 /* { dg-output "\[^\n\r]*value <unknown> is outside the range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" { target int128 } } */
 /* { dg-output "\[^\n\r]*value <unknown> is outside the range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" { target int128 } } */
-/* { dg-output "\[^\n\r]*value <unknown> is outside the range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" { target int128 } } */
+/* { dg-output "\[^\n\r]*value <unknown> is outside the range of representable values of type '__int128 unsigned'" { target int128 } } */
diff --git gcc/testsuite/c-c++-common/ubsan/load-bool-enum.c gcc/testsuite/c-c++-common/ubsan/load-bool-enum.c
index 4ffd632..c7f0683c 100644
--- gcc/testsuite/c-c++-common/ubsan/load-bool-enum.c
+++ gcc/testsuite/c-c++-common/ubsan/load-bool-enum.c
@@ -11,7 +11,7 @@ __attribute__((noinline, noclone)) enum A
 foo (bool *p)
 {
   *p = b;   /* { dg-output "load-bool-enum.c:13:\[^\n\r]*runtime error: \[^\n\r]*load of value 4, which is not a valid value for type '(_B|b)ool'\[^\n\r]*(\n|\r\n|\r)*" } */
-  return a; /* { dg-output "\[^\n\r]*load-bool-enum.c:14:\[^\n\r]*runtime error: \[^\n\r]*load of value 9, which is not a valid value for type 'A'\[^\n\r]*(\n|\r\n|\r)*" { target c++ } } */
+  return a; /* { dg-output "\[^\n\r]*load-bool-enum.c:14:\[^\n\r]*runtime error: \[^\n\r]*load of value 9, which is not a valid value for type 'A'" { target c++ } } */
 }
 
 int
diff --git gcc/testsuite/c-c++-common/ubsan/null-1.c gcc/testsuite/c-c++-common/ubsan/null-1.c
index 17f6d19..26dc22c 100644
--- gcc/testsuite/c-c++-common/ubsan/null-1.c
+++ gcc/testsuite/c-c++-common/ubsan/null-1.c
@@ -9,4 +9,4 @@ main (void)
   return *p;
 }
 
-/* { dg-output "load of null pointer of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-10.c gcc/testsuite/c-c++-common/ubsan/null-10.c
index 8dacf6c..2ff9485 100644
--- gcc/testsuite/c-c++-common/ubsan/null-10.c
+++ gcc/testsuite/c-c++-common/ubsan/null-10.c
@@ -10,4 +10,4 @@ main (void)
   return  0;
 }
 
-/* { dg-output "load of null pointer of type 'short int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'short int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-11.c gcc/testsuite/c-c++-common/ubsan/null-11.c
index 6aefaab..659a5f2 100644
--- gcc/testsuite/c-c++-common/ubsan/null-11.c
+++ gcc/testsuite/c-c++-common/ubsan/null-11.c
@@ -13,4 +13,4 @@ main (void)
   return (*s)->i;
 }
 
-/* { dg-output "load of null pointer of type 'struct S \\*'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'struct S \\*'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-2.c gcc/testsuite/c-c++-common/ubsan/null-2.c
index df4901f..de9d519 100644
--- gcc/testsuite/c-c++-common/ubsan/null-2.c
+++ gcc/testsuite/c-c++-common/ubsan/null-2.c
@@ -9,4 +9,4 @@ main (void)
   return ***ppp;
 }
 
-/* { dg-output "load of null pointer of type 'int \\*\\*'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'int \\*\\*'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-3.c gcc/testsuite/c-c++-common/ubsan/null-3.c
index b1eb3db..e9e8b7b 100644
--- gcc/testsuite/c-c++-common/ubsan/null-3.c
+++ gcc/testsuite/c-c++-common/ubsan/null-3.c
@@ -15,4 +15,4 @@ main (void)
   return foo (*p);
 }
 
-/* { dg-output "load of null pointer of type 'int \\*'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'int \\*'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-4.c gcc/testsuite/c-c++-common/ubsan/null-4.c
index 7c0aa2c..0901816 100644
--- gcc/testsuite/c-c++-common/ubsan/null-4.c
+++ gcc/testsuite/c-c++-common/ubsan/null-4.c
@@ -11,4 +11,4 @@ main (void)
   return 0;
 }
 
-/* { dg-output "load of null pointer of type 'complex double'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'complex double'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-5.c gcc/testsuite/c-c++-common/ubsan/null-5.c
index f7f6b86..fb2d493 100644
--- gcc/testsuite/c-c++-common/ubsan/null-5.c
+++ gcc/testsuite/c-c++-common/ubsan/null-5.c
@@ -13,4 +13,4 @@ main (void)
   return 0;
 }
 
-/* { dg-output "load of null pointer of type 'volatile const complex float'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'volatile const complex float'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-6.c gcc/testsuite/c-c++-common/ubsan/null-6.c
index 6f8ba6b..1239793 100644
--- gcc/testsuite/c-c++-common/ubsan/null-6.c
+++ gcc/testsuite/c-c++-common/ubsan/null-6.c
@@ -10,4 +10,4 @@ main (void)
   return 0;
 }
 
-/* { dg-output "store to null pointer of type 'long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "store to null pointer of type 'long unsigned int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-7.c gcc/testsuite/c-c++-common/ubsan/null-7.c
index 92881d7..19c21da 100644
--- gcc/testsuite/c-c++-common/ubsan/null-7.c
+++ gcc/testsuite/c-c++-common/ubsan/null-7.c
@@ -14,4 +14,4 @@ main (void)
   return *gao ();
 }
 
-/* { dg-output "load of null pointer of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "load of null pointer of type 'int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-8.c gcc/testsuite/c-c++-common/ubsan/null-8.c
index 2468241..73bef75 100644
--- gcc/testsuite/c-c++-common/ubsan/null-8.c
+++ gcc/testsuite/c-c++-common/ubsan/null-8.c
@@ -13,4 +13,4 @@ main (void)
   return s->i;
 }
 
-/* { dg-output "member access within null pointer of type 'struct S'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "member access within null pointer of type 'struct S'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/null-9.c gcc/testsuite/c-c++-common/ubsan/null-9.c
index 88d441c..0b993cf 100644
--- gcc/testsuite/c-c++-common/ubsan/null-9.c
+++ gcc/testsuite/c-c++-common/ubsan/null-9.c
@@ -13,4 +13,4 @@ main (void)
   return u->i;
 }
 
-/* { dg-output "member access within null pointer of type 'union U'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "member access within null pointer of type 'union U'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-1.c gcc/testsuite/c-c++-common/ubsan/object-size-1.c
index 7a3c87a..f4ea8bb 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-1.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-1.c
@@ -102,7 +102,7 @@ f4 (void)
 /* { dg-output "\[^\n\r]*store to address \[^\n\r]* with insufficient space for an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
 
 __attribute__((noinline, noclone)) void
 f5 (int *p)
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-10.c gcc/testsuite/c-c++-common/ubsan/object-size-10.c
index ebc8582..cafab51 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-10.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-10.c
@@ -56,7 +56,7 @@ fn5 (int i, int j)
 /* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
 
 __attribute__ ((noinline, noclone)) int
 fn6 (int i)
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-4.c gcc/testsuite/c-c++-common/ubsan/object-size-4.c
index 8b95ec9..7e55a0f 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-4.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-4.c
@@ -28,4 +28,4 @@ main (void)
 /* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-5.c gcc/testsuite/c-c++-common/ubsan/object-size-5.c
index 3dada10..6d10fdf 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-5.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-5.c
@@ -27,7 +27,7 @@ f1 (int i)
 /* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
 
 int
 main ()
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-7.c gcc/testsuite/c-c++-common/ubsan/object-size-7.c
index f5b26e5..268de64 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-7.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-7.c
@@ -26,4 +26,4 @@ main ()
 /* { dg-output "load of address \[^\n\r]* with insufficient space for an object of type\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-8.c gcc/testsuite/c-c++-common/ubsan/object-size-8.c
index ee0945b..f09a445 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-8.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-8.c
@@ -29,4 +29,4 @@ main (void)
 /* { dg-output "load of address \[^\n\r]* with insufficient space for an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
diff --git gcc/testsuite/c-c++-common/ubsan/object-size-9.c gcc/testsuite/c-c++-common/ubsan/object-size-9.c
index 829c822..379744d 100644
--- gcc/testsuite/c-c++-common/ubsan/object-size-9.c
+++ gcc/testsuite/c-c++-common/ubsan/object-size-9.c
@@ -81,7 +81,7 @@ f5 (int i)
 /* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for an object of type 'unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */
 
 int
 main (void)
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-add-2.c gcc/testsuite/c-c++-common/ubsan/overflow-add-2.c
index 61097fa..b104d61 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-add-2.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-add-2.c
@@ -57,4 +57,4 @@ main (void)
 /* { dg-output "\[^\n\r]*signed integer overflow: \[^\n\r]* \\+ 1024 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* \\+ -1 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: -1 \\+ -\[^\n\r]* cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* \\+ -1024 cannot be represented in type 'long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* \\+ -1024 cannot be represented in type 'long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-int128.c gcc/testsuite/c-c++-common/ubsan/overflow-int128.c
index 4384d7c..400f25b 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-int128.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-int128.c
@@ -44,4 +44,4 @@ main (void)
 /* { dg-output "\[^\n\r]*signed integer overflow: 0x80000000000000000000000000000000 - 1 cannot be represented in type '__int128'(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: 0x80000000000000000000000000000064 \\+ -1024 cannot be represented in type '__int128'(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: 0x7fffffffffffffffffffffffffffffff \\* 2 cannot be represented in type '__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*negation of 0x80000000000000000000000000000000 cannot be represented in type '__int128'; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*negation of 0x80000000000000000000000000000000 cannot be represented in type '__int128'; cast to an unsigned type to negate this value to itself" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-mul-2.c gcc/testsuite/c-c++-common/ubsan/overflow-mul-2.c
index 54b382a..1ccc3f7 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-mul-2.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-mul-2.c
@@ -23,4 +23,4 @@ main (void)
 /* { dg-output "signed integer overflow: 2147483647 \\* 2 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: 2 \\* 2147483647 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: \[^\n\r]* \\* 2 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 2 \\* \[^\n\r]* cannot be represented in type 'long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 2 \\* \[^\n\r]* cannot be represented in type 'long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-mul-4.c gcc/testsuite/c-c++-common/ubsan/overflow-mul-4.c
index 834eda6..1878451 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-mul-4.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-mul-4.c
@@ -83,4 +83,4 @@ main ()
 /* { dg-output "\[^\n\r]*overflow-mul-4.c:48:\[^\n\r]*signed integer overflow: 4257126176 \\* 2166572391 cannot be represented in type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*overflow-mul-4.c:49:\[^\n\r]*signed integer overflow: -4257126176 \\* -2166572391 cannot be represented in type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*overflow-mul-4.c:50:\[^\n\r]*signed integer overflow: -4257126176 \\* 2166572391 cannot be represented in type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*overflow-mul-4.c:51:\[^\n\r]*signed integer overflow: 4257126176 \\* -2166572391 cannot be represented in type 'long long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*overflow-mul-4.c:51:\[^\n\r]*signed integer overflow: 4257126176 \\* -2166572391 cannot be represented in type 'long long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-negate-1.c gcc/testsuite/c-c++-common/ubsan/overflow-negate-1.c
index 35fa482..87b4797 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-negate-1.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-negate-1.c
@@ -35,4 +35,4 @@ main (void)
 /* { dg-output "\[^\n\r]*negation of -\[^\n\r]* cannot be represented in type 'long int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*negation of -9223372036854775808 cannot be represented in type 'long long int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*negation of -9223372036854775808 cannot be represented in type 'long long int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*negation of -9223372036854775808 cannot be represented in type 'long long int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*negation of -9223372036854775808 cannot be represented in type 'long long int'\[^\n\r]*; cast to an unsigned type to negate this value to itself" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-negate-3.c gcc/testsuite/c-c++-common/ubsan/overflow-negate-3.c
index e6db394..85acce8 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-negate-3.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-negate-3.c
@@ -18,4 +18,4 @@ main ()
 /* { dg-output "negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-sub-2.c gcc/testsuite/c-c++-common/ubsan/overflow-sub-2.c
index 88c4762..cc94061 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-sub-2.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-sub-2.c
@@ -51,4 +51,4 @@ main (void)
 /* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* - 1 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* - 1024 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* - 1 cannot be represented in type 'long int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* - 1048576 cannot be represented in type 'long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: -\[^\n\r]* - 1048576 cannot be represented in type 'long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/overflow-sub-4.c gcc/testsuite/c-c++-common/ubsan/overflow-sub-4.c
index 519b7ba..d3fb9ba 100644
--- gcc/testsuite/c-c++-common/ubsan/overflow-sub-4.c
+++ gcc/testsuite/c-c++-common/ubsan/overflow-sub-4.c
@@ -16,4 +16,4 @@ main ()
 }
 
 /* { dg-output "negation of -2147483648 cannot be represented in type 'int'\[^\n\r]*; cast to an unsigned type to negate this value to itself\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 0 - -2147483648 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 0 - -2147483648 cannot be represented in type 'int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/pr59333.c gcc/testsuite/c-c++-common/ubsan/pr59333.c
index 3550475..b687757 100644
--- gcc/testsuite/c-c++-common/ubsan/pr59333.c
+++ gcc/testsuite/c-c++-common/ubsan/pr59333.c
@@ -15,4 +15,4 @@ main (void)
   return 0;
 }
 
-/* { dg-output "signed integer overflow: 2 \\+ 9223372036854775807 cannot be represented in type 'long long int'\[^\n\r]*" } */
+/* { dg-output "signed integer overflow: 2 \\+ 9223372036854775807 cannot be represented in type 'long long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/pr59667.c gcc/testsuite/c-c++-common/ubsan/pr59667.c
index c76c9de..d534661 100644
--- gcc/testsuite/c-c++-common/ubsan/pr59667.c
+++ gcc/testsuite/c-c++-common/ubsan/pr59667.c
@@ -11,4 +11,4 @@ main (void)
   return 0;
 }
 
-/* { dg-output "store to null pointer of type 'float'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "store to null pointer of type 'float'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/pr60613-2.c gcc/testsuite/c-c++-common/ubsan/pr60613-2.c
index af6917e..ed33e93 100644
--- gcc/testsuite/c-c++-common/ubsan/pr60613-2.c
+++ gcc/testsuite/c-c++-common/ubsan/pr60613-2.c
@@ -33,4 +33,4 @@ main ()
 }
 
 /* { dg-output "signed integer overflow: 8 \\- -9223372036854775801 cannot be represented in type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 8 \\- -9223372036854775802 cannot be represented in type 'long long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 8 \\- -9223372036854775802 cannot be represented in type 'long long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/pr60636.c gcc/testsuite/c-c++-common/ubsan/pr60636.c
index d6749ab..4164341 100644
--- gcc/testsuite/c-c++-common/ubsan/pr60636.c
+++ gcc/testsuite/c-c++-common/ubsan/pr60636.c
@@ -12,4 +12,4 @@ main ()
   return 0;
 }
 
-/* { dg-output "negation of -9223372036854775808 cannot be represented in type 'long long int'\[^\n\r]*" } */
+/* { dg-output "negation of -9223372036854775808 cannot be represented in type 'long long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/pr63802.c gcc/testsuite/c-c++-common/ubsan/pr63802.c
index 454c098..0ca7461 100644
--- gcc/testsuite/c-c++-common/ubsan/pr63802.c
+++ gcc/testsuite/c-c++-common/ubsan/pr63802.c
@@ -20,4 +20,4 @@ int main ()
   return 0;
 }
 
-/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct test_struct', which requires 64 byte alignment.*" } */
+/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct test_struct', which requires 64 byte alignment" } */
diff --git gcc/testsuite/c-c++-common/ubsan/recovery-1.c gcc/testsuite/c-c++-common/ubsan/recovery-1.c
index 8043a5c..62dd6f7 100644
--- gcc/testsuite/c-c++-common/ubsan/recovery-1.c
+++ gcc/testsuite/c-c++-common/ubsan/recovery-1.c
@@ -6,4 +6,4 @@
 /* { dg-output "shift exponent 152 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent 153 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 1 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 2 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 2 cannot be represented in type 'int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/recovery-3.c gcc/testsuite/c-c++-common/ubsan/recovery-3.c
index 02f2272..d1dcd3e 100644
--- gcc/testsuite/c-c++-common/ubsan/recovery-3.c
+++ gcc/testsuite/c-c++-common/ubsan/recovery-3.c
@@ -6,4 +6,4 @@
 /* { dg-output "shift exponent 152 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent 153 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 1 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 2 cannot be represented in type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 2147483647 \\+ 2 cannot be represented in type 'int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/shift-1.c gcc/testsuite/c-c++-common/ubsan/shift-1.c
index d5c70ba..d770e83 100644
--- gcc/testsuite/c-c++-common/ubsan/shift-1.c
+++ gcc/testsuite/c-c++-common/ubsan/shift-1.c
@@ -28,4 +28,4 @@ main (void)
 /* { dg-output "\[^\n\r]*shift exponent 154 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent 524 is too large for \[^\n\r]*-bit type 'long long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent 370 is too large for \[^\n\r]*-bit type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*shift exponent 402 is too large for \[^\n\r]*-bit type 'long int'\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*shift exponent 402 is too large for \[^\n\r]*-bit type 'long int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/shift-2.c gcc/testsuite/c-c++-common/ubsan/shift-2.c
index 426ec09..23067d8 100644
--- gcc/testsuite/c-c++-common/ubsan/shift-2.c
+++ gcc/testsuite/c-c++-common/ubsan/shift-2.c
@@ -20,4 +20,4 @@ main (void)
 /* { dg-output "\[^\n\r]*shift exponent -4 is negative\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent -5 is negative\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*shift exponent -6 is negative\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*shift exponent -11 is negative\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*shift exponent -11 is negative" } */
diff --git gcc/testsuite/c-c++-common/ubsan/shift-4.c gcc/testsuite/c-c++-common/ubsan/shift-4.c
index 5f095b6..5b539ac 100644
--- gcc/testsuite/c-c++-common/ubsan/shift-4.c
+++ gcc/testsuite/c-c++-common/ubsan/shift-4.c
@@ -11,4 +11,4 @@ main ()
   return 0;
 }
 
-/* { dg-output "shift exponent 120 is too large\[^\n\r]*" } */
+/* { dg-output "shift exponent 120 is too large" } */
diff --git gcc/testsuite/c-c++-common/ubsan/shift-7.c gcc/testsuite/c-c++-common/ubsan/shift-7.c
index 1e33273..5ecd368 100644
--- gcc/testsuite/c-c++-common/ubsan/shift-7.c
+++ gcc/testsuite/c-c++-common/ubsan/shift-7.c
@@ -24,4 +24,4 @@ main ()
 }
 
 /* { dg-output "shift exponent 4294967296 is too large for \[^\n\r]*-bit type 'long long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*shift exponent 4294967296 is too large for \[^\n\r]*-bit type 'long long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*shift exponent 4294967296 is too large for \[^\n\r]*-bit type 'long long unsigned int'" } */
diff --git gcc/testsuite/c-c++-common/ubsan/undefined-2.c gcc/testsuite/c-c++-common/ubsan/undefined-2.c
index 05dea44..9f764f8 100644
--- gcc/testsuite/c-c++-common/ubsan/undefined-2.c
+++ gcc/testsuite/c-c++-common/ubsan/undefined-2.c
@@ -19,4 +19,4 @@ main ()
   return 0;
 }
 
-/* { dg-output "shift exponent -\[^\n\r]* is negative\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "shift exponent -\[^\n\r]* is negative" } */
diff --git gcc/testsuite/c-c++-common/ubsan/vla-1.c gcc/testsuite/c-c++-common/ubsan/vla-1.c
index 1412203..52ade3a 100644
--- gcc/testsuite/c-c++-common/ubsan/vla-1.c
+++ gcc/testsuite/c-c++-common/ubsan/vla-1.c
@@ -116,4 +116,4 @@ main (void)
 /* { dg-output "\[^\n\r]*variable length array bound evaluates to non-positive value -1\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*variable length array bound evaluates to non-positive value -1\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*variable length array bound evaluates to non-positive value -6\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*variable length array bound evaluates to non-positive value -4\[^\n\r]*" } */
+/* { dg-output "\[^\n\r]*variable length array bound evaluates to non-positive value -4" } */
diff --git gcc/testsuite/g++.dg/ubsan/null-1.C gcc/testsuite/g++.dg/ubsan/null-1.C
index e1524b1..04e8490 100644
--- gcc/testsuite/g++.dg/ubsan/null-1.C
+++ gcc/testsuite/g++.dg/ubsan/null-1.C
@@ -27,4 +27,4 @@ main (void)
 // { dg-output "reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
 // { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
 // { dg-output "\[^\n\r]*reference binding to null pointer of type 'const L'(\n|\r\n|\r)" }
-// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
+// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'" }
diff --git gcc/testsuite/g++.dg/ubsan/null-3.C gcc/testsuite/g++.dg/ubsan/null-3.C
index cd3716b..0dfb879 100644
--- gcc/testsuite/g++.dg/ubsan/null-3.C
+++ gcc/testsuite/g++.dg/ubsan/null-3.C
@@ -17,4 +17,4 @@ main (void)
 // { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
 // { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
 // { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
-// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
+// { dg-output "\[^\n\r]*reference binding to null pointer of type 'int'" }
diff --git gcc/testsuite/g++.dg/ubsan/null-4.C gcc/testsuite/g++.dg/ubsan/null-4.C
index 55944a4..397f0b4 100644
--- gcc/testsuite/g++.dg/ubsan/null-4.C
+++ gcc/testsuite/g++.dg/ubsan/null-4.C
@@ -15,6 +15,6 @@ main (void)
   int &r5 = *p;
 }
 
-// { dg-output "reference binding to null pointer of type 'int'(\n|\r\n|\r)" }
+// { dg-output "reference binding to null pointer of type 'int'" }
 // { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} }
 // { dg-final { cleanup-tree-dump "sanopt" } }
diff --git gcc/testsuite/g++.dg/ubsan/vptr-8.C gcc/testsuite/g++.dg/ubsan/vptr-8.C
index 1533f20..cb6c6ea 100644
--- gcc/testsuite/g++.dg/ubsan/vptr-8.C
+++ gcc/testsuite/g++.dg/ubsan/vptr-8.C
@@ -29,4 +29,4 @@ T::~T ()
 // { dg-output "0x\[0-9a-fA-F]*: note: object is of type 'T'(\n|\r\n|\r)" }
 // { dg-output "  ?.. .. .. ..  ?.. .. .. ..  ?.. .. .. .. \[^\n\r]*(\n|\r\n|\r)" }
 // { dg-output "              ?\\^~~~~~~~~~~\[^\n\r]*(\n|\r\n|\r)" }
-// { dg-output "              ?vptr for 'T'\[^\n\r]*(\n|\r\n|\r)" }
+// { dg-output "              ?vptr for 'T'" }
diff --git gcc/testsuite/g++.dg/ubsan/vptr-9.C gcc/testsuite/g++.dg/ubsan/vptr-9.C
index 482e3e6..9fce584 100644
--- gcc/testsuite/g++.dg/ubsan/vptr-9.C
+++ gcc/testsuite/g++.dg/ubsan/vptr-9.C
@@ -19,4 +19,4 @@ main ()
 // { dg-output "0x\[0-9a-fA-F]*: note: object is of type 'U'(\n|\r\n|\r)" }
 // { dg-output "  ?.. .. .. ..  ?.. .. .. ..  ?.. .. .. .. \[^\n\r]*(\n|\r\n|\r)" }
 // { dg-output "              ?\\^~~~~~~~~~~\[^\n\r]*(\n|\r\n|\r)" }
-// { dg-output "              ?vptr for 'U'\[^\n\r]*(\n|\r\n|\r)" }
+// { dg-output "              ?vptr for 'U'" }
diff --git gcc/testsuite/gcc.dg/ubsan/bounds-2.c gcc/testsuite/gcc.dg/ubsan/bounds-2.c
index 3e88035..fb16eb4 100644
--- gcc/testsuite/gcc.dg/ubsan/bounds-2.c
+++ gcc/testsuite/gcc.dg/ubsan/bounds-2.c
@@ -15,4 +15,4 @@ main ()
   foo (3, (int (*)[3]) &a);
 }
 
-/* { dg-output "index 3 out of bounds for type 'int \\\[\\\*\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "index 3 out of bounds for type 'int \\\[\\\*\\\]'" } */
diff --git gcc/testsuite/gcc.dg/ubsan/object-size-9.c gcc/testsuite/gcc.dg/ubsan/object-size-9.c
index bb9aa1b..e0a2980 100644
--- gcc/testsuite/gcc.dg/ubsan/object-size-9.c
+++ gcc/testsuite/gcc.dg/ubsan/object-size-9.c
@@ -21,4 +21,4 @@ main (void)
 /* { dg-output "load of address \[^\n\r]* with insufficient space for an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*\\^" } */