diff options
| author | Nils Andreas Svee <me@lochnair.net> | 2017-12-21 21:11:40 +0100 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-12-24 22:12:49 +0000 |
| commit | 4fb97e62ceb5a6c8bde23e38dbbf20abca479cfa (patch) | |
| tree | 2c2aca13f9486de92027aedfc1ea3c3a2db8b7fb /main/gcc | |
| parent | c97520670d7f0e17837f32413f73d542173c4712 (diff) | |
| download | aports-4fb97e62ceb5a6c8bde23e38dbbf20abca479cfa.tar.bz2 aports-4fb97e62ceb5a6c8bde23e38dbbf20abca479cfa.tar.xz | |
main/gcc: disable multilib paths on mips64
Diffstat (limited to 'main/gcc')
| -rw-r--r-- | main/gcc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/gcc/gcc-pure64-mips.patch | 47 |
2 files changed, 51 insertions, 2 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 1bb77b6eed..5386f595dd 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -186,7 +186,8 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgba 320-libffi-gnulinux.patch fix-rs6000-pie.patch - fix-linux-header-use-in-libgcc.patch + fix-linux-header-use-in-libgcc.patch + gcc-pure64-mips.patch " # we build out-of-tree @@ -637,4 +638,5 @@ fa44c8158111627aa0e91c43e7cc3aa38642c2041c96532dd4f0932dae4d6f92ea2850b683abcf10 385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998 310-build-gcj-s390x.patch f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181 320-libffi-gnulinux.patch 01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed fix-rs6000-pie.patch -34a818d5be67eb1f34e44a80b83c28a9b9c17d37fc9fac639f490d6bb5b53ebe3318140d09c236a17d7c98f5a7792ae3d6cefccda8067a5e942d6305b9d1f87c fix-linux-header-use-in-libgcc.patch" +34a818d5be67eb1f34e44a80b83c28a9b9c17d37fc9fac639f490d6bb5b53ebe3318140d09c236a17d7c98f5a7792ae3d6cefccda8067a5e942d6305b9d1f87c fix-linux-header-use-in-libgcc.patch +86be3338cc9c33089608bc4c5e3b7918c4e500a345c338f361b18c342119a6ed69af5495d72950de7106d760f003528b46ad14795e805f8a3331e206dcb234e3 gcc-pure64-mips.patch" diff --git a/main/gcc/gcc-pure64-mips.patch b/main/gcc/gcc-pure64-mips.patch new file mode 100644 index 0000000000..d78f283810 --- /dev/null +++ b/main/gcc/gcc-pure64-mips.patch @@ -0,0 +1,47 @@ +From b8c4e45d052adc247341066f748421743704b481 Mon Sep 17 00:00:00 2001 +From: Nils Andreas Svee <me@lochnair.net> +Date: Thu, 21 Dec 2017 03:14:33 +0100 +Subject: [PATCH] Pure 64-bit MIPS + +--- + 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 803ab98e7..afd74752f 100644 +--- a/gcc/config/mips/mips.h ++++ b/gcc/config/mips/mips.h +@@ -3330,11 +3330,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 16c8adf85..bb46204db 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 +-- +2.15.1 + |