ppc64-pure64.patch (2514B)
1--- gcc/config/rs6000/t-linux 2+++ gcc/config/rs6000/t-linux 3@@ -2,7 +2,8 @@ 4 # or soft-float. 5 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) 6 ifneq (,$(findstring powerpc64,$(target))) 7-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 8+MULTILIB_OSDIRNAMES := m64=../lib 9+MULTILIB_OSDIRNAMES += m32=../lib32 10 else 11 ifneq (,$(findstring spe,$(target))) 12 MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1) 13@@ -14,7 +15,8 @@ 14 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) 15 endif 16 ifneq (,$(findstring powerpc64le,$(target))) 17-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) 18+MULTILIB_OSDIRNAMES := m64=../lib 19+MULTILIB_OSDIRNAMES += m32=../lib32 20 endif 21 endif 22 23--- gcc/config/rs6000/t-linux64 24+++ gcc/config/rs6000/t-linux64 25@@ -28,8 +28,8 @@ 26 MULTILIB_OPTIONS := m64/m32 27 MULTILIB_DIRNAMES := 64 32 28 MULTILIB_EXTRA_OPTS := 29-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) 30-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) 31+MULTILIB_OSDIRNAMES := m64=../lib 32+MULTILIB_OSDIRNAMES += m32=../lib32 33 34 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 35 $(COMPILE) $< 36--- gcc/config/rs6000/t-linux64bele 37+++ gcc/config/rs6000/t-linux64bele 38@@ -2,6 +2,6 @@ 39 40 MULTILIB_OPTIONS += mlittle 41 MULTILIB_DIRNAMES += le 42-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) 43-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) 44+MULTILIB_OSDIRNAMES = m64=../lib 45+MULTILIB_OSDIRNAMES+= m32=../lib32 46 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} 47--- gcc/config/rs6000/t-linux64lebe 48+++ gcc/config/rs6000/t-linux64lebe 49@@ -2,6 +2,6 @@ 50 51 MULTILIB_OPTIONS += mbig 52 MULTILIB_DIRNAMES += be 53-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) 54-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) 55+MULTILIB_OSDIRNAMES := m64=../lib 56+MULTILIB_OSDIRNAMES += m32=../lib32 57 MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN}