* [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/files/8.3.0/
@ 2019-04-13 19:33 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2019-04-13 19:33 UTC (permalink / raw
To: gentoo-commits
commit: f62a7335b8b058b46330d41ef0acdaccc2b27894
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 19:29:01 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 19:33:19 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f62a7335
sys-devel/gcc: fix patch
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-devel/gcc/files/8.3.0/gcc-pure64.patch | 8 +++-----
1 file changed, 3 insertions(+), 5 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 53ea7fd..e5f05c1 100644
--- a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch
+++ b/sys-devel/gcc/files/8.3.0/gcc-pure64.patch
@@ -1,8 +1,6 @@
-Adopted from https://git.alpinelinux.org/aports/tree/main/gcc/gcc-pure64.patch
-
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 14:07:21.580151954 -0400
++++ gcc-8.3.0/gcc/config/aarch64/t-aarch64-linux 2019-04-13 15:09:58.438825918 -0400
@@ -22,7 +22,7 @@
LIB1ASMFUNCS = _aarch64_sync_cache_range
@@ -13,8 +11,8 @@ 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 13:58:55.047489953 -0400
-+++ gcc-8.3.0/gcc/config/i386/t-linux64 2019-04-13 14:09:48.131716954 -0400
+--- 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
@@ -33,6 +33,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/files/8.3.0/
@ 2019-04-13 19:57 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2019-04-13 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 1f4c14342a9377853b039eeefba990acd205fbc8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 19:57:13 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 19:57:13 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1f4c1434
sys-devel/gcc: fix patch again
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-devel/gcc/files/8.3.0/gcc-pure64.patch | 16 +++++++++-------
1 file 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-13 19:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-13 19:33 [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/files/8.3.0/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2019-04-13 19:57 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox