From d3547cab78d67d520da35f7ec44659f9be362602 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 14 Nov 2012 22:45:25 +0000 Subject: [PATCH] t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. 2012-11-14 Matthias Klose * config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. * config/sparc/t-linux: New file; define MULTIARCH_DIRNAME. * config.gcc (tmake_file): Include sparc/t-linux for 32bit non-biarch configurations. From-SVN: r193510 --- gcc/ChangeLog | 7 +++++++ gcc/config.gcc | 1 + gcc/config/sparc/t-linux | 1 + gcc/config/sparc/t-linux64 | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gcc/config/sparc/t-linux diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c9b78933bc..f520ddcc7c3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2012-11-14 Matthias Klose + * config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. + * config/sparc/t-linux: New file; define MULTIARCH_DIRNAME. + * config.gcc (tmake_file): Include sparc/t-linux + for 32bit non-biarch configurations. + +2012-11-14 Matthias Klose + * 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 665a7436349..ef64e92b2e0 100644 --- 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 index 00000000000..bb8fc29e55b --- /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 d9dfad66ce7..a56d807cef9 100644 --- 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) -- 2.11.4.GIT