[pushed] libstdc++-v3: drop GCC Runtime Library Exception from gen tests

Message ID 20240329135437.1220285-1-arsen@aarsen.me
State Committed
Commit f15cea16cc98912bf0ed14d388510d6c2618ba90
Headers
Series [pushed] libstdc++-v3: drop GCC Runtime Library Exception from gen tests |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged

Commit Message

Arsen Arsenović March 29, 2024, 1:53 p.m. UTC
  It was mistakenly added to these files.

libstdc++-v3/ChangeLog:

	* testsuite/24_iterators/range_generators/01.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/02.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/copy.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/except.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/subrange.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/synopsis.cc: Drop GCC
	Runtime Library Exception.
	* testsuite/24_iterators/range_generators/iter_deref_return.cc:
	Drop GCC Runtime Library Exception from the "You should have
	received a copy" paragraph.
---
I am the original author of these files and I'm re-contributing them
without the GCC Runtime Library Exception as it is not relevant to
tests.

 .../testsuite/24_iterators/range_generators/01.cc        | 9 ++-------
 .../testsuite/24_iterators/range_generators/02.cc        | 9 ++-------
 .../testsuite/24_iterators/range_generators/copy.cc      | 9 ++-------
 .../testsuite/24_iterators/range_generators/except.cc    | 9 ++-------
 .../24_iterators/range_generators/iter_deref_return.cc   | 4 ++++
 .../testsuite/24_iterators/range_generators/subrange.cc  | 9 ++-------
 .../testsuite/24_iterators/range_generators/synopsis.cc  | 9 ++-------
 7 files changed, 16 insertions(+), 42 deletions(-)
  

Patch

diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
index 2af5ed1895a..81837e156fe 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/01.cc
@@ -12,13 +12,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <generator>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
index 8e23a9c4933..da2d2d42f04 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/02.cc
@@ -12,13 +12,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <iostream>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
index c74fb0cf09e..7ceec33dd78 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/copy.cc
@@ -12,13 +12,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
index 82f6e4e45f6..87d8cebb185 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/except.cc
@@ -12,13 +12,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
index 75471952e76..a39f769b29e 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/iter_deref_return.cc
@@ -12,6 +12,10 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
 #include <generator>
 
 // Check that the return type of iterator::operator* is the reference type.
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
index 93d7126cafe..106d604cd47 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/subrange.cc
@@ -12,13 +12,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <generator>
diff --git a/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc b/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
index d031f1d0c94..7eb77b4bb72 100644
--- a/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
+++ b/libstdc++-v3/testsuite/24_iterators/range_generators/synopsis.cc
@@ -13,13 +13,8 @@ 
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License and
-// a copy of the GCC Runtime Library Exception along with this program;
-// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
 #include <generator>