Fix __iosfail_type_info hack to work on darwin

	* src/c++11/Makefile.am: Rewrite sed rule to be less fragile and to
	handle mangled names starting with double underscores on darwin.
	* src/c++11/Makefile.in: Regenerate.

From-SVN: r259371

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0069a6854c937981f7d10fcf7cd9c0a18396861..b9f6ba942929eb41a29bfd78da2aa965745c2d6f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-13  Jonathan Wakely  <jwakely@redhat.com>
+
+       * src/c++11/Makefile.am: Rewrite sed rule to be less fragile and to
+       handle mangled names starting with double underscores on darwin.
+       * src/c++11/Makefile.in: Regenerate.
+
 2018-04-12  Jonathan Wakely  <jwakely@redhat.com>
 
        * src/c++11/Makefile.am: Fix comment.

diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am
index 8d524b672323e2ae1ef0e01885f73f7c7e695ecb..12bc004a2eab713839aff0a71912dbc92e29adbe 100644 (file)
--- a/libstdc++-v3/src/c++11/Makefile.am
+++ b/libstdc++-v3/src/c++11/Makefile.am
@@ -128,10 +128,7 @@ hashtable_c++0x.o: hashtable_c++0x.cc
 
 if ENABLE_DUAL_ABI
 # Rewrite the type info for __ios_failure.
-rewrite_ios_failure_typeinfo = sed -e '/^_ZTISt13__ios_failure:$$/{' \
-       -e 'n' \
-       -e 's/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/' \
-       -e '}'
+rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
 
 cxx11-ios_failure-lt.s: cxx11-ios_failure.cc
        $(LTCXXCOMPILE) -S $< -o tmp-cxx11-ios_failure-lt.s

diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in
index 1ae782d7e969e86d575b7f5e6a5042be01a3995e..5d510aef69a385f6135361be2a8c6e747f894f6c 100644 (file)
--- a/libstdc++-v3/src/c++11/Makefile.in
+++ b/libstdc++-v3/src/c++11/Makefile.in
@@ -435,11 +435,7 @@ sources = \
 libc__11convenience_la_SOURCES = $(sources)  $(inst_sources)
 
 # Rewrite the type info for __ios_failure.
-@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_ZTISt13__ios_failure:$$/{' \
-@ENABLE_DUAL_ABI_TRUE@ -e 'n' \
-@ENABLE_DUAL_ABI_TRUE@ -e 's/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/' \
-@ENABLE_DUAL_ABI_TRUE@ -e '}'
-
+@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually