From: Matthias Klose <doko@debian.org>
Date: Mon, 16 Feb 2004 21:39:23 +0000 (+0000)
Subject: t-slibgcc-elf-ver: Define SHLIB_NAME and SHLIB_SONAME in terms of SHLIB_SOVERSION.
X-Git-Tag: releases/gcc-4.0.0~10080
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c958ed273d3699212053c174c8d6607031a98f5;p=thirdparty%2Fgcc.git

t-slibgcc-elf-ver: Define SHLIB_NAME and SHLIB_SONAME in terms of SHLIB_SOVERSION.

        * config/t-slibgcc-elf-ver: Define SHLIB_NAME and SHLIB_SONAME
        in terms of SHLIB_SOVERSION.
        * config/m68k/t-slibgcc-elf-ver: New file.
        * config/pa/t-slibgcc-elf-ver: New file.
        * config.gcc (m68k-linux, parisc-linux): Use them when not
        sjlj exceptions are not configured.

From-SVN: r77920
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd41d8a52d07..62ead8916bca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-16  Matthias Klose  <doko@debian.org>
+
+        * config/t-slibgcc-elf-ver: Define SHLIB_NAME and SHLIB_SONAME
+        in terms of SHLIB_SOVERSION.
+        * config/m68k/t-slibgcc-elf-ver: New file.
+        * config/pa/t-slibgcc-elf-ver: New file.
+        * config.gcc (m68k-linux, parisc-linux): Use them when not 
+	sjlj exceptions are not configured.
+
 2004-02-16  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* config/sparc/sparc.c (get_pc_symbol_name): Mark with GTY(()).
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 7005d6c8f3aa..841bd189597a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -744,6 +744,11 @@ hppa*-*-linux* | parisc*-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
 	tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
+	# if not configured with --enable-sjlj-exceptions, bump the
+	# libgcc version number
+	if test x$sjlj != x1; then
+	    tmake_file="$tmake_file pa/t-slibgcc-elf-ver"
+	fi
 	;;
 # port not yet contributed.
 #hppa*-*-openbsd*)
@@ -1221,6 +1226,11 @@ m68k-*-linux*)		# Motorola m68k's running GNU/Linux
 	tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
 	tm_defines="MOTOROLA USE_GAS"
 	tmake_file="t-slibgcc-elf-ver t-linux"
+	# if not configured with --enable-sjlj-exceptions, bump the
+	# libgcc version number
+	if test x$sjlj != x1; then
+	    tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
+	fi
 	;;
 m68k-*-rtems*)
 	tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
diff --git a/gcc/config/m68k/t-slibgcc-elf-ver b/gcc/config/m68k/t-slibgcc-elf-ver
new file mode 100644
index 000000000000..6aac37cc08fc
--- /dev/null
+++ b/gcc/config/m68k/t-slibgcc-elf-ver
@@ -0,0 +1,3 @@
+# Bump the version number of the shared libgcc library
+
+SHLIB_SOVERSION = 2
diff --git a/gcc/config/pa/t-slibgcc-elf-ver b/gcc/config/pa/t-slibgcc-elf-ver
new file mode 100644
index 000000000000..6aac37cc08fc
--- /dev/null
+++ b/gcc/config/pa/t-slibgcc-elf-ver
@@ -0,0 +1,3 @@
+# Bump the version number of the shared libgcc library
+
+SHLIB_SOVERSION = 2
diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver
index cad62680226f..bd40978f984c 100644
--- a/gcc/config/t-slibgcc-elf-ver
+++ b/gcc/config/t-slibgcc-elf-ver
@@ -3,8 +3,9 @@
 
 SHLIB_EXT = .so
 SHLIB_SOLINK = @shlib_base_name@.so
-SHLIB_SONAME = @shlib_so_name@.so.1
-SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1
+SHLIB_SOVERSION = 1
+SHLIB_SONAME = @shlib_so_name@.so.$(SHLIB_SOVERSION)
+SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.$(SHLIB_SOVERSION)
 SHLIB_MAP = @shlib_map_file@
 SHLIB_OBJS = @shlib_objs@
 SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@