diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config.gcc | 1 | ||||
| -rw-r--r-- | gcc/config/sparc/t-linux | 1 | ||||
| -rw-r--r-- | gcc/config/sparc/t-linux64 | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c9b789..f520ddc 100644 --- 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 --- 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 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 --- 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) |