From e8028ecdd02be651ec23cfdbc7e31c5b4b198ce1 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 23 Oct 2012 05:01:24 +0000 Subject: [PATCH] re PR go/54918 (libgo.so.0 is not runtime compatible between gcc-4.6.2 and gcc-4.7.x) PR go/54918 libgo: Set library version number. From-SVN: r192706 --- libgo/Makefile.am | 3 ++- libgo/Makefile.in | 4 +++- libgo/configure | 2 +- libgo/configure.ac | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index a0565b80b3a..ad9f254d7e6 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1860,7 +1860,8 @@ libgo_go_objs = \ libgo_la_SOURCES = $(runtime_files) -libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS) +libgo_la_LDFLAGS = \ + -version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS) libgo_la_LIBADD = \ $(libgo_go_objs) ../libbacktrace/libbacktrace.la \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 48228231972..829dd8c5f91 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -2002,7 +2002,9 @@ libgo_go_objs = \ unicode/utf8.lo libgo_la_SOURCES = $(runtime_files) -libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS) +libgo_la_LDFLAGS = \ + -version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS) + libgo_la_LIBADD = \ $(libgo_go_objs) ../libbacktrace/libbacktrace.la \ $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS) diff --git a/libgo/configure b/libgo/configure index e20fa71f6a0..04fa89d6879 100755 --- a/libgo/configure +++ b/libgo/configure @@ -2493,7 +2493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -libtool_VERSION=1:0:0 +libtool_VERSION=3:1:0 # Default to --enable-multilib diff --git a/libgo/configure.ac b/libgo/configure.ac index 217763d19b2..8cde50ba0c1 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -11,7 +11,7 @@ AC_INIT(package-unused, version-unused,, libgo) AC_CONFIG_SRCDIR(Makefile.am) AC_CONFIG_HEADER(config.h) -libtool_VERSION=1:0:0 +libtool_VERSION=3:1:0 AC_SUBST(libtool_VERSION) AM_ENABLE_MULTILIB(, ..) -- 2.30.2