Fix broken sed command from previous commit
authorJonathan Wakely <jwakely@redhat.com>
Fri, 13 Apr 2018 10:55:29 +0000 (11:55 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Fri, 13 Apr 2018 10:55:29 +0000 (11:55 +0100)
* src/c++11/Makefile.am: Fix sed command.
* src/c++11/Makefile.in: Regenerate.

From-SVN: r259374

libstdc++-v3/ChangeLog
libstdc++-v3/src/c++11/Makefile.am
libstdc++-v3/src/c++11/Makefile.in

index b9f6ba942929eb41a29bfd78da2aa965745c2d6f..4fae49c29332ac0684834cfbc47a011d10625d34 100644 (file)
@@ -1,5 +1,8 @@
 2018-04-13  Jonathan Wakely  <jwakely@redhat.com>
 
+       * src/c++11/Makefile.am: Fix sed command.
+       * src/c++11/Makefile.in: Regenerate.
+
        * 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.
index 12bc004a2eab713839aff0a71912dbc92e29adbe..cdc49bb7f9b56742563e8de16c16e8e5b9b9979e 100644 (file)
@@ -128,7 +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:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
+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
index 5d510aef69a385f6135361be2a8c6e747f894f6c..dd103ec4060a7a31c03efefa56b074e8137879cd 100644 (file)
@@ -435,7 +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:/,_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
+@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