0023-Pure-64-bit-MIPS.patch (1912B)
1 From 720c0d7094d27b6cbfe9669c4f65e2021debcb07 Mon Sep 17 00:00:00 2001 2 From: Nils Andreas Svee <me@lochnair.net> 3 Date: Thu, 21 Dec 2017 03:14:33 +0100 4 Subject: [PATCH] Pure 64-bit MIPS 5 6 --- 7 gcc/config/mips/mips.h | 8 ++++---- 8 gcc/config/mips/t-linux64 | 6 +++--- 9 2 files changed, 7 insertions(+), 7 deletions(-) 10 11 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h 12 index 3ce0c19a29a..b9920b49167 100644 13 --- a/gcc/config/mips/mips.h 14 +++ b/gcc/config/mips/mips.h 15 @@ -3424,11 +3424,11 @@ struct GTY(()) machine_function { 16 /* If we are *not* using multilibs and the default ABI is not ABI_32 we 17 need to change these from /lib and /usr/lib. */ 18 #if MIPS_ABI_DEFAULT == ABI_N32 19 -#define STANDARD_STARTFILE_PREFIX_1 "/lib32/" 20 -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/" 21 +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" 22 +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" 23 #elif MIPS_ABI_DEFAULT == ABI_64 24 -#define STANDARD_STARTFILE_PREFIX_1 "/lib64/" 25 -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/" 26 +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" 27 +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" 28 #endif 29 30 /* Load store bonding is not supported by micromips and fix_24k. The 31 diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 32 index ceb58d3b5f3..8116e23ebba 100644 33 --- a/gcc/config/mips/t-linux64 34 +++ b/gcc/config/mips/t-linux64 35 @@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 36 MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) 37 MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) 38 MULTILIB_OSDIRNAMES = \ 39 - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ 40 - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ 41 - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) 42 + ../lib \ 43 + ../lib32 \ 44 + ../lib 45 -- 46 2.31.1 47