| 1 |
commit: 13a404519fb31f98f98a50bd346e31a7d767fe84 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 13 18:24:01 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 13 18:24:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=13a40451 |
| 7 |
|
| 8 |
sys-devel/gcc: address issue #233 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 12 |
|
| 13 |
sys-devel/gcc/files/8.3.0/gcc-pure64.patch | 25 +++++++++++++++++++++++++ |
| 14 |
sys-devel/gcc/gcc-8.3.0-r1.ebuild | 3 ++- |
| 15 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..53ea7fd |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch |
| 22 |
@@ -0,0 +1,25 @@ |
| 23 |
+Adopted from https://git.alpinelinux.org/aports/tree/main/gcc/gcc-pure64.patch |
| 24 |
+ |
| 25 |
+diff -Naur gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux |
| 26 |
+--- gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2018-01-03 05:03:58.000000000 -0500 |
| 27 |
++++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 14:07:21.580151954 -0400 |
| 28 |
+@@ -22,7 +22,7 @@ |
| 29 |
+ LIB1ASMFUNCS = _aarch64_sync_cache_range |
| 30 |
+ |
| 31 |
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) |
| 32 |
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) |
| 33 |
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib |
| 34 |
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) |
| 35 |
+ |
| 36 |
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
| 37 |
+diff -Naur gcc-8.3.0.orig/gcc/config/i386/t-linux64 gcc-8.3.0/gcc/config/i386/t-linux64 |
| 38 |
+--- gcc-8.3.0.orig/gcc/config/i386/t-linux64 2019-04-13 13:58:55.047489953 -0400 |
| 39 |
++++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 14:09:48.131716954 -0400 |
| 40 |
+@@ -33,6 +33,6 @@ |
| 41 |
+ comma=, |
| 42 |
+ MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) |
| 43 |
+ MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) |
| 44 |
+-MULTILIB_OSDIRNAMES = m64=../lib64 |
| 45 |
++MULTILIB_OSDIRNAMES = m64=../lib |
| 46 |
+ MULTILIB_OSDIRNAMES+= m32=../lib32 |
| 47 |
+ MULTILIB_OSDIRNAMES+= mx32=../libx32 |
| 48 |
|
| 49 |
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 50 |
index 115bd4f..1cf74d8 100644 |
| 51 |
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 52 |
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild |
| 53 |
@@ -1,7 +1,7 @@ |
| 54 |
# Copyright 1999-2019 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
-EAPI="5" |
| 58 |
+EAPI="6" |
| 59 |
|
| 60 |
PATCH_VER="1.1" |
| 61 |
|
| 62 |
@@ -24,5 +24,6 @@ src_prepare() { |
| 63 |
if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then |
| 64 |
epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
| 65 |
epatch "${FILESDIR}"/7.1.0/posix_memalign.patch |
| 66 |
+ epatch "${FILESDIR}"/8.3.0/gcc-pure64.patch |
| 67 |
fi |
| 68 |
} |
Archives