| 1 |
commit: 1f4c14342a9377853b039eeefba990acd205fbc8 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 13 19:57:13 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 13 19:57:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1f4c1434 |
| 7 |
|
| 8 |
sys-devel/gcc: fix patch again |
| 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 | 16 +++++++++------- |
| 14 |
1 file changed, 9 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch |
| 17 |
index e5f05c1..291785c 100644 |
| 18 |
--- a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch |
| 19 |
+++ b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
diff -Naur gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux |
| 22 |
---- gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2018-01-03 05:03:58.000000000 -0500 |
| 23 |
-+++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 15:09:58.438825918 -0400 |
| 24 |
+--- gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2018-01-03 10:03:58.000000000 +0000 |
| 25 |
++++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 19:48:43.100885251 +0000 |
| 26 |
@@ -22,7 +22,7 @@ |
| 27 |
LIB1ASMFUNCS = _aarch64_sync_cache_range |
| 28 |
|
| 29 |
@@ -11,13 +11,15 @@ diff -Naur gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-8.3.0/gcc/confi |
| 30 |
|
| 31 |
MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
| 32 |
diff -Naur gcc-8.3.0.orig/gcc/config/i386/t-linux64 gcc-8.3.0/gcc/config/i386/t-linux64 |
| 33 |
---- gcc-8.3.0.orig/gcc/config/i386/t-linux64 2019-04-13 14:59:49.693150688 -0400 |
| 34 |
-+++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 15:11:02.608894977 -0400 |
| 35 |
+--- gcc-8.3.0.orig/gcc/config/i386/t-linux64 2018-01-03 10:03:58.000000000 +0000 |
| 36 |
++++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 19:50:02.079841292 +0000 |
| 37 |
@@ -33,6 +33,6 @@ |
| 38 |
comma=, |
| 39 |
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) |
| 40 |
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) |
| 41 |
--MULTILIB_OSDIRNAMES = m64=../lib64 |
| 42 |
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) |
| 43 |
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) |
| 44 |
+-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) |
| 45 |
+MULTILIB_OSDIRNAMES = m64=../lib |
| 46 |
- MULTILIB_OSDIRNAMES+= m32=../lib32 |
| 47 |
- MULTILIB_OSDIRNAMES+= mx32=../libx32 |
| 48 |
++MULTILIB_OSDIRNAMES+= m32=../lib32 |
| 49 |
++MULTILIB_OSDIRNAMES+= mx32=../libx32 |
Archives