package/develop/gcc/hotfix-mips64.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/gcc/hotfix-mips64.patch
   3 # Copyright (C) 2010 - 2023 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 We do not need 3 multilib configs by default, use 64 and n32 by default.
  15
  16   - Rene Rebe <rene@exactcode.de>
  17
  18 --- gcc-13.2.0/gcc/config/mips/t-linux64.vanilla        2023-10-12 11:49:59.186318920 +0200
  19 +++ gcc-13.2.0/gcc/config/mips/t-linux64        2023-10-12 11:50:57.326320445 +0200
  20 @@ -16,30 +16,8 @@
  21  # along with GCC; see the file COPYING3.  If not see
  22  # <http://www.gnu.org/licenses/>.
  23
  24 -MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
  25 -MULTILIB_DIRNAMES = n32 32 64
  26 -MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
  27 -MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
  28 -ifeq (yes,$(enable_multiarch))
  29 -  ifneq (,$(findstring gnuabi64,$(target)))
  30 -    MULTILIB_OSDIRNAMES = \
  31 -       ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
  32 -       ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
  33 -       ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
  34 -  else ifneq (,$(findstring gnuabin32,$(target)))
  35 -    MULTILIB_OSDIRNAMES = \
  36 -       ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
  37 -       ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
  38 -       ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
  39 -  else
  40 -    MULTILIB_OSDIRNAMES = \
  41 -       ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
  42 -       ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
  43 -       ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
  44 -  endif
  45 -else
  46 -  MULTILIB_OSDIRNAMES = \
  47 -       ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
  48 -       ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
  49 -       ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
  50 -endif
  51 +MULTILIB_OPTIONS = mabi=64/mabi=32
  52 +MULTILIB_DIRNAMES = 64 32
  53 +MULTILIB_OSDIRNAMES = \
  54 +       ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
  55 +       ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT))