Push out first half of local patch Disable libstdc versioning
See https://android-review.googlesource.com/#/c/45269
Change-Id: Idbe9d639213a9e4f07c0521f1d502866dbd75ce3
diff --git a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
index a7b0fd2..e85ee7d 100644
--- a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
+++ b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
@@ -14,19 +14,6 @@
gcc-4.6/libstdc++-v3/src/Makefile.in | 7 +++++--
4 files changed, 12 insertions(+), 6 deletions(-)
-diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.am b/gcc-4.4.3/libstdc++-v3/src/Makefile.am
-index 187e38e..8fc9ef1 100644
---- a/gcc-4.4.3/libstdc++-v3/src/Makefile.am
-+++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.am
-@@ -206,7 +206,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/libsupc++/libsupc++convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
- # Use special rules for the deprecated source files so that they find
- # deprecated include files.
diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.in b/gcc-4.4.3/libstdc++-v3/src/Makefile.in
index 74bbdd4..f08bf34 100644
--- a/gcc-4.4.3/libstdc++-v3/src/Makefile.in
@@ -40,38 +27,16 @@
@ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
@ENABLE_SYMVERS_FALSE@version_arg =
@ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,--version-script=libstdc++-symbols.ver
-@@ -454,7 +454,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/libsupc++/libsupc++convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
-
- # Use special rules for the deprecated source files so that they find
@@ -576,6 +576,9 @@ clean-toolexeclibLTLIBRARIES:
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
++libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.am b/gcc-4.6/libstdc++-v3/src/Makefile.am
-index 43488ce..66007ff 100644
---- a/gcc-4.6/libstdc++-v3/src/Makefile.am
-+++ b/gcc-4.6/libstdc++-v3/src/Makefile.am
-@@ -251,7 +251,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/libsupc++/libsupc++convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in
index 146ec3f..99f0f56 100644
--- a/gcc-4.6/libstdc++-v3/src/Makefile.in
@@ -85,38 +50,16 @@
@ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep)
@ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
@ENABLE_SYMVERS_FALSE@version_arg =
-@@ -466,7 +466,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/libsupc++/libsupc++convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
@@ -596,6 +596,9 @@ clean-toolexeclibLTLIBRARIES:
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
++libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.am b/gcc-4.7/libstdc++-v3/src/Makefile.am
-index a1eb04d..ee328e4 100644
---- a/gcc-4.7/libstdc++-v3/src/Makefile.am
-+++ b/gcc-4.7/libstdc++-v3/src/Makefile.am
-@@ -74,7 +74,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/src/c++11/libc++11convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.in b/gcc-4.7/libstdc++-v3/src/Makefile.in
index b10d853..3669b06 100644
--- a/gcc-4.7/libstdc++-v3/src/Makefile.in
@@ -130,20 +73,11 @@
@GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources =
@GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
@ENABLE_PARALLEL_FALSE@parallel_compat_sources =
-@@ -367,7 +367,7 @@ libstdc___la_DEPENDENCIES = \
- $(top_builddir)/src/c++11/libc++11convenience.la
-
- libstdc___la_LDFLAGS = \
-- -version-info $(libtool_VERSION) ${version_arg} -lm
-+ -avoid-version ${version_arg} -lm
-
- libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
-
@@ -515,6 +515,9 @@ clean-toolexeclibLTLIBRARIES:
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
++libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+
mostlyclean-compile:
