From fd969fd2af9a7d97f8ac6762ccb621380ea15943 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Fri, 26 Mar 2021 14:46:54 -0700 Subject: [PATCH 3/4] ARC/debian: gcc: defines for multilib/multiarch enabling This is equivalent of following for arc - debian/patches/gcc-multiarch.diff - debian/patches/gcc-multilib-multiarch.diff Signed-off-by: Vineet Gupta --- debian/patches/gcc-multiarch-arc.diff | 12 ++++++++++++ debian/rules.patch | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/gcc-multiarch-arc.diff diff --git a/debian/patches/gcc-multiarch-arc.diff b/debian/patches/gcc-multiarch-arc.diff new file mode 100644 index 000000000000..936883ae2285 --- /dev/null +++ b/debian/patches/gcc-multiarch-arc.diff @@ -0,0 +1,12 @@ +DP: ARC: inhibit multilibs, define MULTILIB_OSDIRNAMES/MULTIARCH_DIRNAME + +--- +--- a/src/gcc/config/arc/t-multilib-linux ++++ b/src/gcc/config/arc/t-multilib-linux +@@ -23,3 +23,6 @@ MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400 + # Aliases: + MULTILIB_MATCHES += mcpu?arc700=mA7 + MULTILIB_MATCHES += mcpu?arc700=mARC700 ++ ++MULTILIB_OSDIRNAMES = ++MULTIARCH_DIRNAME = $(call if_multiarch,arc-linux-gnu) diff --git a/debian/rules.patch b/debian/rules.patch index 65fcbf8e4087..5c8aa1cd90f7 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -228,7 +228,7 @@ ifeq (,$(filter 2.1%, $(shell dpkg-query -l libc-bin | awk '/^.i/ {print $$3}')) #debian_patches += pr67899 endif -debian_patches += gcc-multiarch +debian_patches += gcc-multiarch gcc-multiarch-arc debian_patches += config-ml ifneq ($(single_package),yes) ifeq ($(with_multiarch_cxxheaders),yes) -- 2.25.1