diff options
Diffstat (limited to 'debian/patches/gcc-multilib-multiarch.diff')
| -rw-r--r-- | debian/patches/gcc-multilib-multiarch.diff | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/debian/patches/gcc-multilib-multiarch.diff b/debian/patches/gcc-multilib-multiarch.diff index a26e69d..8e64315 100644 --- a/debian/patches/gcc-multilib-multiarch.diff +++ b/debian/patches/gcc-multilib-multiarch.diff @@ -1,7 +1,5 @@ # DP: Don't auto-detect multilib osdirnames. -Index: b/src/gcc/config/sparc/t-linux64 -=================================================================== --- a/src/gcc/config/sparc/t-linux64 +++ b/src/gcc/config/sparc/t-linux64 @@ -25,7 +25,12 @@ @@ -18,8 +16,6 @@ Index: b/src/gcc/config/sparc/t-linux64 +endif MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu) -Index: b/src/gcc/config/s390/t-linux64 -=================================================================== --- a/src/gcc/config/s390/t-linux64 +++ b/src/gcc/config/s390/t-linux64 @@ -7,7 +7,12 @@ @@ -36,8 +32,6 @@ Index: b/src/gcc/config/s390/t-linux64 +endif MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu) -Index: b/src/gcc/config/rs6000/t-linux64 -=================================================================== --- a/src/gcc/config/rs6000/t-linux64 +++ b/src/gcc/config/rs6000/t-linux64 @@ -28,8 +28,13 @@ @@ -55,8 +49,6 @@ Index: b/src/gcc/config/rs6000/t-linux64 MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu) -Index: b/src/gcc/config/i386/t-linux64 -=================================================================== --- a/src/gcc/config/i386/t-linux64 +++ b/src/gcc/config/i386/t-linux64 @@ -33,9 +33,19 @@ @@ -80,8 +72,6 @@ Index: b/src/gcc/config/i386/t-linux64 ifneq (,$(findstring x86_64,$(target))) ifneq (,$(findstring biarchx32.h,$(tm_include_list))) -Index: b/src/gcc/config/mips/t-linux64 -=================================================================== --- a/src/gcc/config/mips/t-linux64 +++ b/src/gcc/config/mips/t-linux64 @@ -23,10 +23,23 @@ MIPS_32 = $(if $(findstring r6, $(firstw @@ -111,8 +101,6 @@ Index: b/src/gcc/config/mips/t-linux64 ifneq (,$(findstring abin32,$(target))) MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_ISA)64$(MIPS_R6)$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) -Index: b/src/gcc/config/rs6000/t-linux -=================================================================== --- a/src/gcc/config/rs6000/t-linux +++ b/src/gcc/config/rs6000/t-linux @@ -2,7 +2,7 @@ @@ -122,5 +110,5 @@ Index: b/src/gcc/config/rs6000/t-linux -MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +MULTILIB_OSDIRNAMES := .=../lib$(call if_multiarch,:powerpc64-linux-gnu) else - ifneq (,$(findstring spe,$(target))) - MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1) + MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) + endif |