38073a05a4
Useful for compiling x86_64 packages on aarch64 [ci:skip-vercheck] [ci:skip-build]: already built successfully in CI
81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
|
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
|
Date: Thu, 6 Jan 2022 03:14:33 +0000
|
|
Subject: [PATCH 21/35] ppc64[le]: disable multilib support
|
|
|
|
multilib is not presently supported on Alpine GCC
|
|
---
|
|
gcc/config/rs6000/t-linux | 6 ++++--
|
|
gcc/config/rs6000/t-linux64 | 4 ++--
|
|
gcc/config/rs6000/t-linux64bele | 4 ++--
|
|
gcc/config/rs6000/t-linux64lebe | 4 ++--
|
|
4 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
|
|
index 4e371255533..128c75c7d39 100644
|
|
--- a/gcc/config/rs6000/t-linux
|
|
+++ b/gcc/config/rs6000/t-linux
|
|
@@ -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 @@ ifneq (,$(findstring powerpcle,$(target)))
|
|
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 --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
|
|
index 01a94242308..b3a76379c03 100644
|
|
--- a/gcc/config/rs6000/t-linux64
|
|
+++ b/gcc/config/rs6000/t-linux64
|
|
@@ -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.cc
|
|
$(COMPILE) $<
|
|
diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
|
|
index 97c1ee6fb4d..08d72639cb6 100644
|
|
--- a/gcc/config/rs6000/t-linux64bele
|
|
+++ b/gcc/config/rs6000/t-linux64bele
|
|
@@ -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 --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
|
|
index 2e63bdb9fc9..c6e1c5db65d 100644
|
|
--- a/gcc/config/rs6000/t-linux64lebe
|
|
+++ b/gcc/config/rs6000/t-linux64lebe
|
|
@@ -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}
|
|
--
|
|
2.41.0
|
|
|