t-aix43, t-aix52 (SHLIB_LINK): Change temporary file tag from a prefix to an infix.

[gcc.git] / gcc / config / rs6000 / t-aix43

diff --git a/gcc/config/rs6000/t-aix43 b/gcc/config/rs6000/t-aix43
index 1327bca0414577992d5181ff2e608fa296bc0bd4..d17523a61033e30acd87ad39f7e7ee13a4010d71 100644 (file)
--- a/gcc/config/rs6000/t-aix43
+++ b/gcc/config/rs6000/t-aix43
@@ -19,27 +19,24 @@ MULTILIB_OPTIONS    = pthread \
 MULTILIB_DIRNAMES      = pthread \
                          common power powerpc ppc64
 
-MULTILIB_MATCHES       = mcpu?power=mpower \
-                         mcpu?power=mrios1 \
+MULTILIB_MATCHES       = mcpu?power=mcpu?power \
+                         mcpu?power=mcpu?power2 \
+                         mcpu?powerpc=mcpu?power3 \
+                         mcpu?powerpc=mcpu?power4 \
+                         mcpu?powerpc=mcpu?powerpc \
                          mcpu?power=mcpu?rios1 \
+                         mcpu?power=mcpu?rios2 \
                          mcpu?power=mcpu?rsc \
                          mcpu?power=mcpu?rsc1 \
-                         mcpu?power=mpower2 \
-                         mcpu?power=mrios2 \
-                         mcpu?power=mcpu?rios2 \
                          mcpu?powerpc=mcpu?rs64a \
                          mcpu?powerpc=mcpu?601 \
                          mcpu?powerpc=mcpu?602 \
                          mcpu?powerpc=mcpu?603 \
                          mcpu?powerpc=mcpu?603e \
                          mcpu?powerpc=mcpu?604 \
+                         mcpu?powerpc=mcpu?604e \
                          mcpu?powerpc=mcpu?620 \
-                         mcpu?powerpc=mcpu?630 \
-                         mcpu?powerpc=mcpu?750 \
-                         mcpu?powerpc=mcpu?403 \
-                         mcpu?powerpc=mpowerpc \
-                         mcpu?powerpc=mpowerpc-gpopt \
-                         mcpu?powerpc=mpowerpc-gfxopt
+                         mcpu?powerpc=mcpu?630
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
@@ -52,17 +49,23 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
        `case @shlib_base_name@ in \
        *pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
        *) echo -lc ;; esac` ; \
-       rm -f tmp-@shlib_base_name@.a ; \
-       $(AR_CREATE_FOR_TARGET) tmp-@shlib_base_name@.a @multilib_dir@/shr.o ; \
-       mv tmp-@shlib_base_name@.a @shlib_base_name@.a ; \
+       rm -f @shlib_base_name@-tmp.a ; \
+       $(AR_CREATE_FOR_TARGET) @shlib_base_name@-tmp.a @multilib_dir@/shr.o ; \
+       mv @shlib_base_name@-tmp.a @shlib_base_name@.a ; \
        rm -f @multilib_dir@/shr.o
 # $(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_base_name@.a $$(slibdir)/
+SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/
 SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac`
 SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
 SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
-SHLIB_NM_FLAGS = -Bpg
+SHLIB_NM_FLAGS = -Bpg -X32_64
+
+# Either 32-bit and 64-bit objects in archives.
+AR_FLAGS_FOR_TARGET = -X32_64
 
-# Both 32-bit and 64-bit objects in archives
-AR_FLAGS_FOR_TARGET=-X32_64
+# Compile Ada files with minimal-toc.  The primary focus is gnatlib, so
+# that the library does not use nearly the entire TOC of applications
+# until gnatlib is built as a shared library on AIX.  Compiling the
+# compiler with -mminimal-toc does not cause any harm.
+T_ADAFLAGS = -mminimal-toc