Bug 1263325 - Unbreak build with libc++ and config/gcc_hidden.h after bug 1239083. r=glandium

MozReview-Commit-ID: 4y4j6o7V54D

--HG--
extra : transplant_source : %E2%27%20%2A%9Db%EE%252%AD%8F%CC%99_%C9%83%F3%ED%CD%CC

intl/icu-patches/bug-1228227-bug-1263325-libc++-gcc_hidden.diff

@@ -0,0 +1,66 @@
+Limit libstdc++ workaround to not upset libc++ with pragma visibility.
+
+https://ssl.icu-project.org/trac/ticket/12023
+
+diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h
+--- a/intl/icu/source/common/unicode/std_string.h
++++ b/intl/icu/source/common/unicode/std_string.h
+@@ -22,16 +22,16 @@
+  * \brief C++ API: Central ICU header for including the C++ standard <string>
+  *                 header and for related definitions.
+  */
+ 
+ #include "unicode/utypes.h"
+ 
+ #if U_HAVE_STD_STRING
+ 
+-#if !defined(_MSC_VER)
++#if defined(__GLIBCXX__)
+ namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+ #endif
+ #include <string>
+ 
+ #endif  // U_HAVE_STD_STRING
+ 
+ #endif  // __STD_STRING_H__
+diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h
+--- a/intl/icu/source/common/utypeinfo.h
++++ b/intl/icu/source/common/utypeinfo.h
+@@ -17,14 +17,14 @@
+ // Whenever 'typeid' is used, this header has to be included
+ // instead of <typeinfo>.
+ // Visual Stuido 10 emits warning 4275 with this change. If you compile
+ // with exception disabled, you have to suppress warning 4275.
+ #if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
+ #include <exception>
+ using std::exception;
+ #endif
+-#if !defined(_MSC_VER)
++#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
+--- a/intl/icu/source/io/unicode/ustream.h
++++ b/intl/icu/source/io/unicode/ustream.h
+@@ -23,17 +23,17 @@
+  * \file
+  * \brief C++ API: Unicode iostream like API
+  *
+  * At this time, this API is very limited. It contains
+  * operator<< and operator>> for UnicodeString manipulation with the
+  * C++ I/O stream API.
+  */
+ 
+-#if !defined(_MSC_VER)
++#if defined(__GLIBCXX__)
+ namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+ #endif
+ 
+ #if U_IOSTREAM_SOURCE >= 199711
+ #if (__GNUC__ == 2)
+ #include <iostream>
+ #else
+ #include <istream>

intl/icu-patches/bug-1228227-libc++-gcc_hidden.diff

@@ -1,23 +0,0 @@
-Limit libstdc++ workaround to not upset libc++ with pragma visibility.
-
-diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h
---- a/intl/icu/source/common/unicode/std_string.h
-+++ b/intl/icu/source/common/unicode/std_string.h
-@@ -22,16 +22,16 @@
-  * \brief C++ API: Central ICU header for including the C++ standard <string>
-  *                 header and for related definitions.
-  */
- 
- #include "unicode/utypes.h"
- 
- #if U_HAVE_STD_STRING
- 
--#if !defined(_MSC_VER)
-+#if defined(__GLIBCXX__)
- namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
- #endif
- #include <string>
- 
- #endif  // U_HAVE_STD_STRING
- 
- #endif  // __STD_STRING_H__

intl/icu/source/common/utypeinfo.h

@@ -22,7 +22,7 @@
 #include <exception>
 using std::exception;
 #endif
-#if !defined(_MSC_VER)
+#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

intl/icu/source/io/unicode/ustream.h

@@ -28,7 +28,7 @@
  * C++ I/O stream API.
  */
 
-#if !defined(_MSC_VER)
+#if defined(__GLIBCXX__)
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif
 

intl/update-icu.sh

@@ -59,7 +59,7 @@ for patch in \
  bug-1172609-timezone-recreateDefault.diff \
  bug-1198952-workaround-make-3.82-bug.diff \
  icu-release-56-1-flagparser-fix.patch \
- bug-1228227-libc++-gcc_hidden.diff \
+ bug-1228227-bug-1263325-libc++-gcc_hidden.diff \
 ; do
   echo "Applying local patch $patch"
   patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch