90 lines
4 KiB
Diff
90 lines
4 KiB
Diff
|
--- ./gcc/config/i386/t-linux64.orig 2013-01-14 16:32:37.000000000 +0000
|
||
|
|
+++ ./gcc/config/i386/t-linux64 2013-04-22 06:12:32.984439677 +0000
|
||
|
|
@@ -34,6 +34,6 @@
|
||
|
|
comma=,
|
||
|
|
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 = m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
||
|
|
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
|
||
|
|
--- ./gcc/config/aarch64/t-aarch64-linux.orig
|
||
|
|
+++ ./gcc/config/aarch64/t-aarch64-linux
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
LIB1ASMFUNCS = _aarch64_sync_cache_range
|
||
|
|
|
||
|
|
AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
|
||
|
|
-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
|
||
|
|
+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
|
||
|
|
MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
|
||
|
|
|
||
|
|
MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
|
||
|
|
--- ./gcc/config/s390/t-linux64.orig
|
||
|
|
+++ ./gcc/config/s390/t-linux64
|
||
|
|
@@ -7,5 +7,5 @@
|
||
|
|
MULTILIB_OPTIONS = m64/m31
|
||
|
|
MULTILIB_DIRNAMES = 64 32
|
||
|
|
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
|
||
|
|
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
|
||
|
|
+MULTILIB_OSDIRNAMES = m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
||
|
|
|
||
|
|
--- ./gcc/config/rs6000/t-linux.orig
|
||
|
|
+++ ./gcc/config/rs6000/t-linux
|
||
|
|
@@ -2,7 +2,8 @@
|
||
|
|
# or soft-float.
|
||
|
|
ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
|
||
|
|
ifneq (,$(findstring powerpc64,$(target)))
|
||
|
|
-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
|
||
|
|
+MULTILIB_OSDIRNAMES := m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
||
|
|
else
|
||
|
|
ifneq (,$(findstring spe,$(target)))
|
||
|
|
MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
|
||
|
|
@@ -14,7 +15,8 @@
|
||
|
|
MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
|
||
|
|
endif
|
||
|
|
ifneq (,$(findstring powerpc64le,$(target)))
|
||
|
|
-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
|
||
|
|
+MULTILIB_OSDIRNAMES := m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
|
||
|
|
--- ./gcc/config/rs6000/t-linux64.orig
|
||
|
|
+++ ./gcc/config/rs6000/t-linux64
|
||
|
|
@@ -28,8 +28,8 @@
|
||
|
|
MULTILIB_OPTIONS := m64/m32
|
||
|
|
MULTILIB_DIRNAMES := 64 32
|
||
|
|
MULTILIB_EXTRA_OPTS :=
|
||
|
|
-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
|
||
|
|
-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
|
||
|
|
+MULTILIB_OSDIRNAMES := m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
||
|
|
|
||
|
|
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
|
||
|
|
$(COMPILE) $<
|
||
|
|
--- ./gcc/config/rs6000/t-linux64bele.orig
|
||
|
|
+++ ./gcc/config/rs6000/t-linux64bele
|
||
|
|
@@ -2,6 +2,6 @@
|
||
|
|
|
||
|
|
MULTILIB_OPTIONS += mlittle
|
||
|
|
MULTILIB_DIRNAMES += le
|
||
|
|
-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
|
||
|
|
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
|
||
|
|
+MULTILIB_OSDIRNAMES = m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
||
|
|
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
|
||
|
|
--- ./gcc/config/rs6000/t-linux64lebe.orig
|
||
|
|
+++ ./gcc/config/rs6000/t-linux64lebe
|
||
|
|
@@ -2,6 +2,6 @@
|
||
|
|
|
||
|
|
MULTILIB_OPTIONS += mbig
|
||
|
|
MULTILIB_DIRNAMES += be
|
||
|
|
-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
|
||
|
|
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
|
||
|
|
+MULTILIB_OSDIRNAMES := m64=../lib
|
||
|
|
+MULTILIB_OSDIRNAMES += m32=../lib32
|
||
|
|
MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}
|