commit:     9c526fd114e6a4e469525bb6aa59db661985c40a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 21:33:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 23:16:41 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=9c526fd1

10.4.0: rebase gentoo/22_all_libstdcxx-no-vtv.patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 10.4.0/gentoo/22_all_libstdcxx-no-vtv.patch | 42 ++++++++++++++++++++---------
 10.4.0/gentoo/README.history                |  3 +++
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/10.4.0/gentoo/22_all_libstdcxx-no-vtv.patch 
b/10.4.0/gentoo/22_all_libstdcxx-no-vtv.patch
index 68508bd..4526af1 100644
--- a/10.4.0/gentoo/22_all_libstdcxx-no-vtv.patch
+++ b/10.4.0/gentoo/22_all_libstdcxx-no-vtv.patch
@@ -5,27 +5,27 @@ Bug: https://bugs.gentoo.org/582524
 Bug: https://gcc.gnu.org/PR85884
 --- a/libstdc++-v3/src/Makefile.am
 +++ b/libstdc++-v3/src/Makefile.am
-@@ -217,7 +217,6 @@ CXXLINK = \
+@@ -221,7 +221,6 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \
 -      $(VTV_CXXLINKFLAGS) \
-       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
- 
- # Symbol versioning for shared libraries.
+       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+       $(LTLDFLAGS) $(LTLIBICONV) \
+       -o $@
 --- a/libstdc++-v3/src/Makefile.in
 +++ b/libstdc++-v3/src/Makefile.in
-@@ -511,7 +511,6 @@ CXXLINK = \
+@@ -596,7 +596,6 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \
 -      $(VTV_CXXLINKFLAGS) \
-       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
- 
- @ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep)
+       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) \
+       $(LTLDFLAGS) $(LTLIBICONV) \
+       -o $@
 --- a/libstdc++-v3/src/c++11/Makefile.am
 +++ b/libstdc++-v3/src/c++11/Makefile.am
-@@ -204,5 +204,4 @@ CXXLINK = \
+@@ -214,5 +214,4 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX --tag disable-shared \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \
@@ -33,7 +33,25 @@ Bug: https://gcc.gnu.org/PR85884
        $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
 --- a/libstdc++-v3/src/c++11/Makefile.in
 +++ b/libstdc++-v3/src/c++11/Makefile.in
-@@ -496,7 +496,6 @@ CXXLINK = \
+@@ -575,7 +575,6 @@ CXXLINK = \
+       $(LIBTOOL) --tag CXX --tag disable-shared \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXX) \
+-      $(VTV_CXXLINKFLAGS) \
+       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+ 
+ all: all-am
+--- a/libstdc++-v3/src/c++17/Makefile.am
++++ b/libstdc++-v3/src/c++17/Makefile.am
+@@ -119,5 +119,4 @@ CXXLINK = \
+       $(LIBTOOL) --tag CXX --tag disable-shared \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXX) \
+-      $(VTV_CXXLINKFLAGS) \
+       $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+--- a/libstdc++-v3/src/c++17/Makefile.in
++++ b/libstdc++-v3/src/c++17/Makefile.in
+@@ -502,7 +502,6 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX --tag disable-shared \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \
@@ -43,7 +61,7 @@ Bug: https://gcc.gnu.org/PR85884
  all: all-am
 --- a/libstdc++-v3/src/c++98/Makefile.am
 +++ b/libstdc++-v3/src/c++98/Makefile.am
-@@ -273,5 +273,4 @@ CXXLINK = \
+@@ -268,5 +268,4 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX --tag disable-shared \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \
@@ -51,7 +69,7 @@ Bug: https://gcc.gnu.org/PR85884
        $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
 --- a/libstdc++-v3/src/c++98/Makefile.in
 +++ b/libstdc++-v3/src/c++98/Makefile.in
-@@ -500,7 +500,6 @@ CXXLINK = \
+@@ -577,7 +577,6 @@ CXXLINK = \
        $(LIBTOOL) --tag CXX --tag disable-shared \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXX) \

diff --git a/10.4.0/gentoo/README.history b/10.4.0/gentoo/README.history
index f86d4e4..7b129d1 100644
--- a/10.4.0/gentoo/README.history
+++ b/10.4.0/gentoo/README.history
@@ -1,3 +1,6 @@
+1              22 May 2022
+       U 22_all_libstdcxx-no-vtv.patch
+
 0              27 November 2021
        + 01_all_default-fortify-source.patch
        + 02_all_default-warn-format-security.patch

Reply via email to