PR go/54918

Revert previous patch: do not change libgo SONAME on branch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@192738 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index afccfbd..82587ca 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -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)

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 2326574..30f9274 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -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)
 

diff --git a/libgo/configure b/libgo/configure
index 2f7dcca..dc85ccf 100755 (executable)
--- a/libgo/configure
+++ b/libgo/configure
@@ -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

diff --git a/libgo/configure.ac b/libgo/configure.ac
index cea8016..a31acab 100644 (file)
--- 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=2:1:0
+libtool_VERSION=1:0:0
 AC_SUBST(libtool_VERSION)
 
 AM_ENABLE_MULTILIB(, ..)