commit: 91544571441f85d7d5d13a3e8370e8cf9a93f29c Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Mon Oct 5 10:23:27 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon Oct 5 22:55:58 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=91544571
sys-devel/gcc: refresh gcc-pure64 patch amd64 and arm64 parts unchanged. moved the file and added ppc64 stuff, based on alpine patch. this is final showstopper before enabling ppc64/ppc64le catalyst builds. Bug: https://bugs.gentoo.org/675954 Issue: https://github.com/gentoo/musl/issues/233 Tracker: https://github.com/gentoo/musl/issues/295 Closes: https://github.com/gentoo/musl/pull/350 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-devel/gcc/files/8.3.0/gcc-pure64.patch | 25 --------- sys-devel/gcc/files/9.3.0/gcc-pure64.patch | 86 ++++++++++++++++++++++++++++++ sys-devel/gcc/gcc-10.1.0-r1.ebuild | 2 +- sys-devel/gcc/gcc-10.2.0-r1.ebuild | 2 +- sys-devel/gcc/gcc-9.3.0-r1.ebuild | 2 +- 5 files changed, 89 insertions(+), 28 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 deleted file mode 100644 index 291785c..0000000 --- a/sys-devel/gcc/files/8.3.0/gcc-pure64.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 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 - - AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) --MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) -+MULTILIB_OSDIRNAMES = mabi.lp64=../lib - MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) - - 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 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$(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 diff --git a/sys-devel/gcc/files/9.3.0/gcc-pure64.patch b/sys-devel/gcc/files/9.3.0/gcc-pure64.patch new file mode 100644 index 0000000..19fd5c9 --- /dev/null +++ b/sys-devel/gcc/files/9.3.0/gcc-pure64.patch @@ -0,0 +1,86 @@ +diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux +--- gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux 2020-10-05 02:59:12.767988285 -0700 ++++ gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux 2020-10-05 03:03:32.310816444 -0700 +@@ -22,7 +22,7 @@ + LIB1ASMFUNCS = _aarch64_sync_cache_range + + AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) +-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) ++MULTILIB_OSDIRNAMES = mabi.lp64=../lib + MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) + + MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) +diff -Naur gcc-9.3.0.orig/gcc/config/i386/t-linux64 gcc-9.3.0/gcc/config/i386/t-linux64 +--- gcc-9.3.0.orig/gcc/config/i386/t-linux64 2020-10-05 02:59:12.757989347 -0700 ++++ gcc-9.3.0/gcc/config/i386/t-linux64 2020-10-05 03:24:58.878825272 -0700 +@@ -33,6 +33,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-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 +diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux gcc-9.3.0/gcc/config/rs6000/t-linux +--- gcc-9.3.0.orig/gcc/config/rs6000/t-linux 2020-10-05 02:59:12.767988285 -0700 ++++ gcc-9.3.0/gcc/config/rs6000/t-linux 2020-10-05 03:03:32.310816444 -0700 +@@ -2,7 +2,8 @@ + # or soft-float. + ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) + ifneq (,$(findstring powerpc64,$(target))) +-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + else + MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) + endif +@@ -10,7 +11,8 @@ + MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) + endif + ifneq (,$(findstring powerpc64le,$(target))) +-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + endif + endif + +diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64 gcc-9.3.0/gcc/config/rs6000/t-linux64 +--- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64 2020-10-05 02:59:12.767988285 -0700 ++++ gcc-9.3.0/gcc/config/rs6000/t-linux64 2020-10-05 03:03:32.310816444 -0700 +@@ -28,8 +28,8 @@ + MULTILIB_OPTIONS := m64/m32 + MULTILIB_DIRNAMES := 64 32 + MULTILIB_EXTRA_OPTS := +-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + + rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c + $(COMPILE) $< +diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64bele gcc-9.3.0/gcc/config/rs6000/t-linux64bele +--- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64bele 2020-10-05 02:59:12.767988285 -0700 ++++ gcc-9.3.0/gcc/config/rs6000/t-linux64bele 2020-10-05 03:03:32.310816444 -0700 +@@ -2,6 +2,6 @@ + + MULTILIB_OPTIONS += mlittle + MULTILIB_DIRNAMES += le +-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) +-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} +diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64lebe gcc-9.3.0/gcc/config/rs6000/t-linux64lebe +--- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64lebe 2020-10-05 02:59:12.777987222 -0700 ++++ gcc-9.3.0/gcc/config/rs6000/t-linux64lebe 2020-10-05 03:03:32.310816444 -0700 +@@ -2,6 +2,6 @@ + + MULTILIB_OPTIONS += mbig + MULTILIB_DIRNAMES += be +-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) +-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) ++MULTILIB_OSDIRNAMES := m64=../lib ++MULTILIB_OSDIRNAMES += m32=../lib32 + MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} diff --git a/sys-devel/gcc/gcc-10.1.0-r1.ebuild b/sys-devel/gcc/gcc-10.1.0-r1.ebuild index 507c829..b77a69d 100644 --- a/sys-devel/gcc/gcc-10.1.0-r1.ebuild +++ b/sys-devel/gcc/gcc-10.1.0-r1.ebuild @@ -19,7 +19,7 @@ src_prepare() { eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch eapply "${FILESDIR}"/7.1.0/posix_memalign.patch case $(tc-arch) in - amd64|arm64|ppc64) eapply "${FILESDIR}"/8.3.0/gcc-pure64.patch ;; + amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;; esac fi diff --git a/sys-devel/gcc/gcc-10.2.0-r1.ebuild b/sys-devel/gcc/gcc-10.2.0-r1.ebuild index 0cccd7d..7f803a3 100644 --- a/sys-devel/gcc/gcc-10.2.0-r1.ebuild +++ b/sys-devel/gcc/gcc-10.2.0-r1.ebuild @@ -19,7 +19,7 @@ src_prepare() { eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch eapply "${FILESDIR}"/7.1.0/posix_memalign.patch case $(tc-arch) in - amd64|arm64|ppc64) eapply "${FILESDIR}"/8.3.0/gcc-pure64.patch ;; + amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;; esac fi diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild index b23cbf8..2ada81c 100644 --- a/sys-devel/gcc/gcc-9.3.0-r1.ebuild +++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild @@ -25,7 +25,7 @@ src_prepare() { eapply "${FILESDIR}"/6.3.0/cpu_indicator.patch eapply "${FILESDIR}"/7.1.0/posix_memalign.patch case $(tc-arch) in - amd64|arm64|ppc64) eapply "${FILESDIR}"/8.3.0/gcc-pure64.patch ;; + amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;; esac fi
