From: Mike Hommey <mh@glandium.org>
Date: Mon, 15 Aug 2022 14:49:40 +0900
Subject: Remove workaround for old libstdc++ problem, which now causes
 problems with GCC 12 on arm

---
 intl/icu/source/common/unicode/std_string.h | 5 -----
 intl/icu/source/common/utypeinfo.h          | 3 ---
 intl/icu/source/io/unicode/ustream.h        | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h
index bf87230..c8388ef 100644
--- a/intl/icu/source/common/unicode/std_string.h
+++ b/intl/icu/source/common/unicode/std_string.h
@@ -29,11 +29,6 @@
 
 #if U_SHOW_CPLUSPLUS_API
 
-// Workaround for a libstdc++ bug before libstdc++4.6 (2011).
-// https://bugs.llvm.org/show_bug.cgi?id=13364
-#if defined(__GLIBCXX__)
-namespace std { class type_info; }
-#endif
 #include <string>
 
 #endif /* U_SHOW_CPLUSPLUS_API */
diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h
index c666373..5d97240 100644
--- a/intl/icu/source/common/utypeinfo.h
+++ b/intl/icu/source/common/utypeinfo.h
@@ -24,9 +24,6 @@
 #include <exception>
 using std::exception;
 #endif
-#if defined(__GLIBCXX__)
-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
-#endif
 #include <typeinfo>  // for 'typeid' to work
 
 #endif
diff --git a/intl/icu/source/io/unicode/ustream.h b/intl/icu/source/io/unicode/ustream.h
index 927342c..93ef51c 100644
--- a/intl/icu/source/io/unicode/ustream.h
+++ b/intl/icu/source/io/unicode/ustream.h
@@ -34,10 +34,6 @@
  * C++ I/O stream API.
  */
 
-#if defined(__GLIBCXX__)
-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
-#endif
-
 #include <iostream>
 
 U_NAMESPACE_BEGIN