t-iris6 (SHLIB_SLIBDIR_SUFFIXES): Define.

	* config/mips/t-iris6 (SHLIB_SLIBDIR_SUFFIXES): Define.
	(SHLIB_LINK, SHLIB_INSTALL): Adjust.

From-SVN: r53347

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a70177693e762a5021c6b720d67d62efa8616c2..f6978fb0d1ac0a61961c102c8945cff98683ad8b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * config/mips/t-iris6 (SHLIB_SLIBDIR_SUFFIXES): Define.
+       (SHLIB_LINK, SHLIB_INSTALL): Adjust.
+
 2002-05-09  Jakub Jelinek  <jakub@redhat.com>
 
        * config/sparc/t-linux64 (SHLIB_MAPFILES): Set.

diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index c1a710fa8ca1a1f7e81fd869f97473b6991e4334..1ade6fd4a932b44f9df3d2684786716857c3a45b 100644 (file)
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -16,16 +16,19 @@ CRTSTUFF_T_CFLAGS=-g1
 
 # Build a shared libgcc library.
 SHLIB_EXT = .so
-SHLIB_NAME = @shlib_base_name@.so
-SHLIB_SONAME = @shlib_base_name@.so.1
+SHLIB_SOLINK = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_so_name@.so.1
+SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1
 SHLIB_MAP = @shlib_map_file@
 SHLIB_OBJS = @shlib_objs@
+SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
+SHLIB_SLIBDIR_SUFFIXES = mabi=64:64 mabi=n32:32
 
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
         -Wl,-soname,$(SHLIB_SONAME) \
        -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
-       rm -f $(SHLIB_SONAME) && \
-       $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
+       rm -f $(SHLIB_SOLINK) && \
+       $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
 # ??? 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.
@@ -33,9 +36,13 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
 
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
-SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \
-       rm -f $$(slibdir)/$(SHLIB_NAME); \
-       $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)
+SHLIB_INSTALL = \
+       $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+       $(INSTALL_DATA) $(SHLIB_NAME) \
+         $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
+       rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
+       $(LN_S) $(SHLIB_SONAME) \
+         $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
 SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver