From 272277dc55c3dbe52da902101046e9ccc2777710 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 13 Apr 2018 11:55:29 +0100 Subject: [PATCH] Fix broken sed command from previous commit * src/c++11/Makefile.am: Fix sed command. * src/c++11/Makefile.in: Regenerate. From-SVN: r259374 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/src/c++11/Makefile.am | 2 +- libstdc++-v3/src/c++11/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b9f6ba94292..4fae49c2933 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-04-13 Jonathan Wakely + * 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. diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 12bc004a2ea..cdc49bb7f9b 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -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 diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 5d510aef69a..dd103ec4060 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -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 -- 2.30.2