diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-04-13 11:06:21 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-04-13 11:06:21 +0100 |
| commit | 06258a7f10942fb005328bacc6c002e81b34e19d (patch) | |
| tree | 1a5edb30675a1e9312ad58101cf9e829bc4a9113 | |
| parent | 1f2131a9b63ff3727980caf6131d77c5d632d2fd (diff) | |
| download | gcc-06258a7f10942fb005328bacc6c002e81b34e19d.zip gcc-06258a7f10942fb005328bacc6c002e81b34e19d.tar.gz gcc-06258a7f10942fb005328bacc6c002e81b34e19d.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.am | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.in | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e0069a6..b9f6ba9 100644 --- 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 8d524b6..12bc004 100644 --- 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 1ae782d..5d510ae 100644 --- 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 |