re PR go/54918 (libgo.so.0 is not runtime compatible between gcc-4.6.2 and gcc-4.7.x)

PR go/54918
Revert previous patch: do not change libgo SONAME on branch.

From-SVN: r192738
This commit is contained in:
Ian Lance Taylor 2012-10-23 18:12:46 +00:00
parent ab2bf6271f
commit f8dcfbd5cb
4 changed files with 4 additions and 7 deletions

View File

@ -1753,8 +1753,7 @@ libgo_go_objs = \
libgo_la_SOURCES = $(runtime_files)
libgo_la_LDFLAGS = \
-version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
libgo_la_LIBADD = \
$(libgo_go_objs) $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS)

View File

@ -1914,9 +1914,7 @@ libgo_go_objs = \
unicode/utf8.lo
libgo_la_SOURCES = $(runtime_files)
libgo_la_LDFLAGS = \
-version-info $(libtool_VERSION) $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
libgo_la_LDFLAGS = $(PTHREAD_CFLAGS) $(AM_LDFLAGS)
libgo_la_LIBADD = \
$(libgo_go_objs) $(LIBFFI) $(PTHREAD_LIBS) $(MATH_LIBS) $(NET_LIBS)

2
libgo/configure vendored
View File

@ -2491,7 +2491,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
libtool_VERSION=2:1:0
libtool_VERSION=1:0:0
# Default to --enable-multilib

View File

@ -11,7 +11,7 @@ AC_INIT(package-unused, version-unused,, libgo)
AC_CONFIG_SRCDIR(Makefile.am)
AC_CONFIG_HEADER(config.h)
libtool_VERSION=2:1:0
libtool_VERSION=1:0:0
AC_SUBST(libtool_VERSION)
AM_ENABLE_MULTILIB(, ..)