From 8eb60b2f2254eee16d44ed5169837743b0debd5a Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 26 Sep 2019 17:08:24 +0100
Subject: [PATCH] Remove include directives for deleted Profile Mode headers
* include/std/array: Remove references to profile mode.
* include/std/bitset: Likewise.
* include/std/deque: Likewise.
* include/std/forward_list: Likewise.
* include/std/list: Likewise.
* include/std/map: Likewise.
* include/std/set: Likewise.
* include/std/unordered_map: Likewise.
* include/std/unordered_set: Likewise.
* include/std/vector: Likewise.
* testsuite/17_intro/headers/c++1998/profile_mode.cc: New test.
* testsuite/17_intro/headers/c++2011/profile_mode.cc: New test.
From-SVN: r276152
---
libstdc++-v3/ChangeLog | 15 ++++++++++++
libstdc++-v3/include/std/array | 4 ----
libstdc++-v3/include/std/bitset | 4 ----
libstdc++-v3/include/std/deque | 4 ----
libstdc++-v3/include/std/forward_list | 4 ----
libstdc++-v3/include/std/list | 4 ----
libstdc++-v3/include/std/map | 4 ----
libstdc++-v3/include/std/set | 4 ----
libstdc++-v3/include/std/unordered_map | 4 ----
libstdc++-v3/include/std/unordered_set | 4 ----
libstdc++-v3/include/std/vector | 4 ----
.../17_intro/headers/c++1998/profile_mode.cc | 23 +++++++++++++++++++
.../17_intro/headers/c++2011/profile_mode.cc | 23 +++++++++++++++++++
13 files changed, 61 insertions(+), 40 deletions(-)
create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc
create mode 100644 libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cd46ef31eaba..5d2349bcb7b4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2019-09-26 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/std/array: Remove references to profile mode.
+ * include/std/bitset: Likewise.
+ * include/std/deque: Likewise.
+ * include/std/forward_list: Likewise.
+ * include/std/list: Likewise.
+ * include/std/map: Likewise.
+ * include/std/set: Likewise.
+ * include/std/unordered_map: Likewise.
+ * include/std/unordered_set: Likewise.
+ * include/std/vector: Likewise.
+ * testsuite/17_intro/headers/c++1998/profile_mode.cc: New test.
+ * testsuite/17_intro/headers/c++2011/profile_mode.cc: New test.
+
2019-09-25 Jonathan Wakely <jwakely@redhat.com>
* include/bits/regex.h
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array
index a380f523d440..b1dc88877872 100644
--- a/libstdc++-v3/include/std/array
+++ b/libstdc++-v3/include/std/array
@@ -422,10 +422,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
# include <debug/array>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/array>
-#endif
-
#endif // C++11
#endif // _GLIBCXX_ARRAY
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index d6958301e8a6..ef4a91a0c156 100644
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -1593,8 +1593,4 @@ _GLIBCXX_END_NAMESPACE_VERSION
# include <debug/bitset>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/bitset>
-#endif
-
#endif /* _GLIBCXX_BITSET */
diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque
index ed4927e13b74..3f8e9abe032e 100644
--- a/libstdc++-v3/include/std/deque
+++ b/libstdc++-v3/include/std/deque
@@ -72,10 +72,6 @@
# include <debug/deque>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/deque>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list
index 9d6cc40593ba..39c3f4438de6 100644
--- a/libstdc++-v3/include/std/forward_list
+++ b/libstdc++-v3/include/std/forward_list
@@ -43,10 +43,6 @@
# include <debug/forward_list>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/forward_list>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list
index 8d6ac198c9a7..35c9d44a39e8 100644
--- a/libstdc++-v3/include/std/list
+++ b/libstdc++-v3/include/std/list
@@ -67,10 +67,6 @@
# include <debug/list>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/list>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/map b/libstdc++-v3/include/std/map
index 0da7c895aacf..0eb4f80f93fe 100644
--- a/libstdc++-v3/include/std/map
+++ b/libstdc++-v3/include/std/map
@@ -67,10 +67,6 @@
# include <debug/map>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/map>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/set b/libstdc++-v3/include/std/set
index a9ce58c45741..4213a4a01b84 100644
--- a/libstdc++-v3/include/std/set
+++ b/libstdc++-v3/include/std/set
@@ -67,10 +67,6 @@
# include <debug/set>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/set>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map
index 60f9bd7a6a65..eb69240a94f4 100644
--- a/libstdc++-v3/include/std/unordered_map
+++ b/libstdc++-v3/include/std/unordered_map
@@ -52,10 +52,6 @@
# include <debug/unordered_map>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/unordered_map>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set
index 904387386143..a28b840c1366 100644
--- a/libstdc++-v3/include/std/unordered_set
+++ b/libstdc++-v3/include/std/unordered_set
@@ -52,10 +52,6 @@
# include <debug/unordered_set>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/unordered_set>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector
index e5e13ab3ef7c..c15faf1da9ab 100644
--- a/libstdc++-v3/include/std/vector
+++ b/libstdc++-v3/include/std/vector
@@ -76,10 +76,6 @@
# include <debug/vector>
#endif
-#ifdef _GLIBCXX_PROFILE
-# include <profile/vector>
-#endif
-
#if __cplusplus >= 201703L
namespace std _GLIBCXX_VISIBILITY(default)
{
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc
new file mode 100644
index 000000000000..d8749f817f75
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/profile_mode.cc
@@ -0,0 +1,23 @@
+// Copyright (C) 2019 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// 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/>.
+
+// { dg-options "-std=gnu++98" }
+// { dg-do compile }
+
+// This macro should have no effect now
+#define _GLIBCXX_PROFILE 1
+#include <bits/extc++.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc
new file mode 100644
index 000000000000..4cf7c5dd1046
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/profile_mode.cc
@@ -0,0 +1,23 @@
+// Copyright (C) 2019 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile { target c++11 } }
+
+// This macro should have no effect now
+#define _GLIBCXX_PROFILE 1
+#include <vector>
--
GitLab