6 files changed, 28 insertions, 15 deletions
diff --git a/gcc/config/alpha/t-osf4 b/gcc/config/alpha/t-osf4
index cf4e118..3bc97ba 100644
--- a/gcc/config/alpha/t-osf4
+++ b/gcc/config/alpha/t-osf4
@@ -5,6 +5,7 @@ CRTSTUFF_T_CFLAGS_S = -fPIC
 TARGET_LIBGCC2_CFLAGS = -fPIC
 
 # Build a shared libgcc library.
+SHLIB_EXT = .so
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-	-Wl,-msym -Wl,-set_version,gcc.3 -Wl,-soname,@shlib_base_name@.so.0
-SHLIB_LIBS = -lc
+	-Wl,-msym -Wl,-set_version,gcc.0 -Wl,-soname,@shlib_base_name@.so.0 \
+	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc
diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index 24e385d..879c841 100644
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -20,12 +20,13 @@ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o
 CRTSTUFF_T_CFLAGS=-g1
 
 # Build a shared libgcc library.
+SHLIB_EXT = .so
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-        -Wl,-soname,@shlib_base_name@.so.0
+        -Wl,-soname,@shlib_base_name@.so.0 \
+	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc
 # ??? Irix 6.5 seems to eat the option fine (if we somehow remove the
 # -hidden_symbol option, which is documented to be ignored in conjunction
 # with -exports_file), but fails to actually hide any symbols.
-# -Wl,-exports_file,libgcc.map
-SHLIB_LIBS = -lc
+# -Wl,-exports_file,@shlib_map_file@
 SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver 
diff --git a/gcc/config/sparc/t-slibgcc b/gcc/config/sparc/t-slibgcc
new file mode 100644
index 0000000..ffeebcb
--- /dev/null
+++ b/gcc/config/sparc/t-slibgcc
@@ -0,0 +1,9 @@
+# Build a shared libgcc library with the GNU linker.
+
+SHLIB_EXT = .so
+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+	-Wl,--soname=@shlib_base_name@.so.0 \
+	-Wl,--version-script=@shlib_map_file@ \
+	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc
+SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
+SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
diff --git a/gcc/config/sparc/t-slibgcc-sld b/gcc/config/sparc/t-slibgcc-sld
new file mode 100644
index 0000000..0c182ab
--- /dev/null
+++ b/gcc/config/sparc/t-slibgcc-sld
@@ -0,0 +1,9 @@
+# Build a shared libgcc library with the Solaris linker.
+
+SHLIB_EXT = .so
+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+	-Wl,-h,@shlib_base_name@.so.0 -Wl,-z,text -Wl,-z,defs \
+	-Wl,-M,@shlib_map_file@ -o @shlib_base_name@.so \
+	@multilib_flags@ @shlib_objs@ -lc
+SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
+SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
diff --git a/gcc/config/sparc/t-sol2 b/gcc/config/sparc/t-sol2
index 7a44631..a9b6ee1 100644
--- a/gcc/config/sparc/t-sol2
+++ b/gcc/config/sparc/t-sol2
@@ -28,11 +28,3 @@ $(T)gcrt1.o: $(srcdir)/config/sparc/sol2-c1.asm $(GCC_PASSES)
 
 CRTSTUFF_T_CFLAGS = -fPIC
 TARGET_LIBGCC2_CFLAGS = -fPIC
-
-# Build a shared libgcc library.
-SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-	-Wl,-h,@shlib_base_name@.so.0 -Wl,-z,text -Wl,-z,defs \
-	-Wl,-M,libgcc.map
-SHLIB_LIBS = -lc
-SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
diff --git a/gcc/config/t-linux b/gcc/config/t-linux
index 858faa9..b66cf56 100644
--- a/gcc/config/t-linux
+++ b/gcc/config/t-linux
@@ -9,10 +9,11 @@ CRTSTUFF_T_CFLAGS_S = -fPIC
 # Compile libgcc2.a with pic.
 TARGET_LIBGCC2_CFLAGS = -fPIC
 # Build a shared libgcc library.
+SHLIB_EXT = .so
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 	-Wl,--soname=@shlib_base_name@.so.0 \
-	-Wl,--version-script=libgcc.map
-SHLIB_LIBS = -lc
+	-Wl,--version-script=@shlib_map_file@ \
+	-o @shlib_base_name@.so @multilib_flags@ @shlib_objs@ -lc
 SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/libgcc-glibc.ver