diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2013-02-18 10:11:08 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2013-02-18 10:11:08 +0100 |
| commit | 1a90e00ee2a7bf6767d31693a498647b017532c2 (patch) | |
| tree | 005ea721a3b7dc4b95c0a11d8a0d5e1417959b3f | |
| parent | 03d18bb3c213a1c4dfcfd237355fb27d692742d7 (diff) | |
| parent | c99ef94df1cd9b0300864df614bcaa9aefb34cda (diff) | |
Fix multiarch merge issues.
| -rw-r--r-- | ChangeLog.linaro | 7 | ||||
| -rw-r--r-- | gcc/config/i386/t-kfreebsd | 2 | ||||
| -rw-r--r-- | gcc/config/i386/t-linux64 | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog.linaro b/ChangeLog.linaro index 6158a876b33..3a6ef52d080 100644 --- a/ChangeLog.linaro +++ b/ChangeLog.linaro @@ -1,3 +1,10 @@ +2013-02-14 Yvan Roux <yvan.roux@linaro.org> + Matthias Klose <doko@ubuntu.com> + + gcc/ + * config/i386/t-linux64: Fix multiarch merge issues. + * config/i386/t-kfreebsd: Likewise. + 2013-02-11 Christophe Lyon <christophe.lyon@linaro.org> gcc/ diff --git a/gcc/config/i386/t-kfreebsd b/gcc/config/i386/t-kfreebsd index b4310df8afb..762d520fae9 100644 --- a/gcc/config/i386/t-kfreebsd +++ b/gcc/config/i386/t-kfreebsd @@ -2,4 +2,4 @@ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu) # MULTILIB_OSDIRNAMES are set in t-linux64. KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target)))) -MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)) +MULTILIB_OSDIRNAMES := $(filter-out mx32=%,$(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))) diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 index dfaf2763d89..d5bedf7bb7c 100644 --- a/gcc/config/i386/t-linux64 +++ b/gcc/config/i386/t-linux64 @@ -36,4 +36,4 @@ MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) -MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x32-linux-gnu) +MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) |