From 3f8fb5d81781e99ddcb9d2bdf06597cea8d7ad20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Date: Wed, 15 Sep 2021 09:56:56 +0200 Subject: [PATCH] aix: adjust installation directories for GCC64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As gcc on 64bit for AIX is built with "MULTILIB_MATCHES= .=maix32", "-print-multi-directory" and similar flags aren't returning the correct directory when used with -maix32: "." is returned instead of "ppc32". Libgcc installation script needs to be adjust to bypass this problem and correctly install 32bit files in a ppc32 subdirectory. libgcc/ChangeLog: 2021-09-03 Clément Chigot * config/rs6000/t-slibgcc-aix (SHLIB_INSTALL): Replace "$(slibdir)@shlib_slibdir_qual@" by $(inst_libdir). --- libgcc/config/rs6000/t-slibgcc-aix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libgcc/config/rs6000/t-slibgcc-aix b/libgcc/config/rs6000/t-slibgcc-aix index 0b03dfa6751..a220451bd6c 100644 --- a/libgcc/config/rs6000/t-slibgcc-aix +++ b/libgcc/config/rs6000/t-slibgcc-aix @@ -68,17 +68,17 @@ SHLIB_LINK = \ rm -f $$shr.imp $$shr.o ; \ fi SHLIB_INSTALL = \ - $(mkinstalldirs) $(DESTDIR)$(slibdir)@shlib_slibdir_qual@; \ + $(mkinstalldirs) $(DESTDIR)$(inst_libdir); \ if test svr4 != $(with_aix_soname) ; then \ $(INSTALL_DATA) @shlib_base_name@.a \ - $(DESTDIR)$(slibdir)@shlib_slibdir_qual@/ ; \ + $(DESTDIR)$(inst_libdir)/ ; \ fi ; \ if test aix != $(with_aix_soname) ; then \ $(INSTALL_DATA) $(SHLIB_SONAME) \ - $(DESTDIR)$(slibdir)@shlib_slibdir_qual@/ ; \ - rm -f $(DESTDIR)$(slibdir)@shlib_slibdir_qual@/@shlib_base_name@.so ; \ + $(DESTDIR)$(inst_libdir)/ ; \ + rm -f $(DESTDIR)$(inst_libdir)/@shlib_base_name@.so ; \ $(LN_S) $(SHLIB_SONAME) \ - $(DESTDIR)$(slibdir)@shlib_slibdir_qual@/@shlib_base_name@.so ; \ + $(DESTDIR)$(inst_libdir)/@shlib_base_name@.so ; \ fi SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac` SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk -- 2.33.0