From 714ed6d9649bf9ed42e34fef9c41169921e63921 Mon Sep 17 00:00:00 2001 From: Nils Andreas Svee Date: Thu, 21 Dec 2017 03:14:33 +0100 Subject: [PATCH] mips64: disable multilib support multilib is not supported by Alpine GCC --- gcc/config/mips/mips.h | 8 ++++---- gcc/config/mips/t-linux64 | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 858bbba3a36..2d4f553e652 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -3447,11 +3447,11 @@ struct GTY(()) machine_function { /* If we are *not* using multilibs and the default ABI is not ABI_32 we need to change these from /lib and /usr/lib. */ #if MIPS_ABI_DEFAULT == ABI_N32 -#define STANDARD_STARTFILE_PREFIX_1 "/lib32/" -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/" +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" #elif MIPS_ABI_DEFAULT == ABI_64 -#define STANDARD_STARTFILE_PREFIX_1 "/lib64/" -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/" +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" #endif /* Load store bonding is not supported by micromips and fix_24k. The diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 index 2fdd8e00407..406a3676289 100644 --- a/gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64 @@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) MULTILIB_OSDIRNAMES = \ - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) + ../lib \ + ../lib32 \ + ../lib