From: GCC Administrator <gccadmin@gcc.gnu.org>
Date: Fri, 25 Apr 2025 00:19:43 +0000 (+0000)
Subject: Daily bump.
X-Git-Tag: releases/gcc-12.5.0~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eabfcb8b09a54bbf3252811c3ba378e2fc3e44a;p=thirdparty%2Fgcc.git

Daily bump.
---

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 1041049a239..c872ff4955e 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20250423
+20250425
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2ba52d0408d..6a5ec578ae4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2025-04-23  Jason Merrill  <jason@redhat.com>
+
+	Backported from master:
+	2025-04-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/114772
+	PR c++/101180
+	* pt.cc (apply_late_template_attributes): Also override
+	target_option_current_node.
+
 2025-01-20  Simon Martin  <simon@nasilyan.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ef9edf6aa91..7cc9484b342 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2025-04-23  Jason Merrill  <jason@redhat.com>
+
+	Backported from master:
+	2025-04-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/114772
+	PR c++/101180
+	* g++.dg/ext/pragma-target2.C: New test.
+
 2025-04-22  Harald Anlauf  <anlauf@gmx.de>
 
 	Backported from master: