2012-11-14 Matthias Klose <doko@ubuntu.com>

        * config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
        * config/sparc/t-linux: New file; define MULTIARCH_DIRNAME.
        * config.gcc <sparc-*-linux*> (tmake_file): Include sparc/t-linux
        for 32bit non-biarch configurations.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193510 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c9b789..f520ddc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
 2012-11-14  Matthias Klose  <doko@ubuntu.com>
 
+       * config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
+       * config/sparc/t-linux: New file; define MULTIARCH_DIRNAME.
+       * config.gcc <sparc-*-linux*> (tmake_file): Include sparc/t-linux
+       for 32bit non-biarch configurations.
+
+2012-11-14  Matthias Klose  <doko@ubuntu.com>
+
        * doc/invoke.texi: Document -print-multiarch.
        * doc/install.texi: Document --enable-multiarch.
        * doc/fragments.texi: Document MULTILIB_OSDIRNAMES, MULTIARCH_DIRNAME.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 665a743..ef64e92 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2422,6 +2422,7 @@ sparc-*-linux*)
                tmake_file="${tmake_file} sparc/t-linux64"
        else
                tm_file="${tm_file} sparc/linux.h"
+               tmake_file="${tmake_file} sparc/t-linux"
        fi
        ;;
 sparc-*-netbsdelf*)

diff --git a/gcc/config/sparc/t-linux b/gcc/config/sparc/t-linux
new file mode 100644 (file)
index 0000000..bb8fc29
--- /dev/null
+++ b/gcc/config/sparc/t-linux
@@ -0,0 +1 @@
+MULTIARCH_DIRNAME = $(call if_multiarch,sparc-linux-gnu)

diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64
index d9dfad6..a56d807 100644 (file)
--- a/gcc/config/sparc/t-linux64
+++ b/gcc/config/sparc/t-linux64
@@ -26,4 +26,5 @@
 
 MULTILIB_OPTIONS = m64/m32
 MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)