aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2019-04-13 15:57:13 -0400
committerAnthony G. Basile <blueness@gentoo.org>2019-04-13 15:57:13 -0400
commit1f4c14342a9377853b039eeefba990acd205fbc8 (patch)
treeab82de3851217aad830121ad87c21a9d8ee46454 /sys-devel
parentsys-devel/gcc: migrate to eapply (diff)
downloadmusl-1f4c14342a9377853b039eeefba990acd205fbc8.tar.gz
musl-1f4c14342a9377853b039eeefba990acd205fbc8.tar.bz2
musl-1f4c14342a9377853b039eeefba990acd205fbc8.zip
sys-devel/gcc: fix patch again
Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc/files/8.3.0/gcc-pure64.patch16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch
index e5f05c1..291785c 100644
--- a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch
+++ b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch
@@ -1,6 +1,6 @@
diff -Naur gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux
---- gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2018-01-03 05:03:58.000000000 -0500
-+++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 15:09:58.438825918 -0400
+--- gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2018-01-03 10:03:58.000000000 +0000
++++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 19:48:43.100885251 +0000
@@ -22,7 +22,7 @@
LIB1ASMFUNCS = _aarch64_sync_cache_range
@@ -11,13 +11,15 @@ diff -Naur gcc-8.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-8.3.0/gcc/confi
MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
diff -Naur gcc-8.3.0.orig/gcc/config/i386/t-linux64 gcc-8.3.0/gcc/config/i386/t-linux64
---- gcc-8.3.0.orig/gcc/config/i386/t-linux64 2019-04-13 14:59:49.693150688 -0400
-+++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 15:11:02.608894977 -0400
+--- gcc-8.3.0.orig/gcc/config/i386/t-linux64 2018-01-03 10:03:58.000000000 +0000
++++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 19:50:02.079841292 +0000
@@ -33,6 +33,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+MULTILIB_OSDIRNAMES = m64=../lib
- MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
++MULTILIB_OSDIRNAMES+= m32=../lib32
++MULTILIB_OSDIRNAMES+= mx32=../libx32