From 3d5a2e386857e0d0f07ea5aedd027be046f72b16 Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Sat, 28 Jan 2023 02:03:20 +0400 Subject: [PATCH] gcc: do use lib64 --- ...01-Revert-change-lib64-lib-directory.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 patches/gcc/0001-Revert-change-lib64-lib-directory.patch diff --git a/patches/gcc/0001-Revert-change-lib64-lib-directory.patch b/patches/gcc/0001-Revert-change-lib64-lib-directory.patch new file mode 100644 index 0000000..797e54b --- /dev/null +++ b/patches/gcc/0001-Revert-change-lib64-lib-directory.patch @@ -0,0 +1,57 @@ +From 6c7a6cf75a6e91aea2777595ef6b69622bb04740 Mon Sep 17 00:00:00 2001 +From: Alexey Sheplyakov +Date: Fri, 27 Jan 2023 18:36:26 +0400 +Subject: [PATCH] Revert "change lib64->lib directory" + +This reverts commit 5813fcc272db43ecba5b14024097164f5e2b70c0. +Alas rpm-based distros need to use lib64 +--- + gcc/config/loongarch/linux.h | 6 +++--- + gcc/config/loongarch/t-linux | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h +index bbbe7d1b02f..110d0fab93d 100644 +--- a/gcc/config/loongarch/linux.h ++++ b/gcc/config/loongarch/linux.h +@@ -24,11 +24,11 @@ along with GCC; see the file COPYING3. If not see + #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH) + + #if DEFAULT_ABI_BASE == ABI_BASE_LP64D +- #define ABI_LIBDIR "lib" ++ #define ABI_LIBDIR "lib64" + #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F +- #define ABI_LIBDIR "lib/f32" ++ #define ABI_LIBDIR "lib64/f32" + #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S +- #define ABI_LIBDIR "lib/sf" ++ #define ABI_LIBDIR "lib64/sf" + #endif + + #endif +diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux +index 864381573ff..5b9796aea2b 100644 +--- a/gcc/config/loongarch/t-linux ++++ b/gcc/config/loongarch/t-linux +@@ -39,15 +39,15 @@ endif + ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),) + + MULTILIB_OSDIRNAMES = \ +- mabi.lp64d=../lib$\ ++ mabi.lp64d=../lib64$\ + $(call if_multiarch,:loongarch64-linux-gnuf64) + + MULTILIB_OSDIRNAMES += \ +- mabi.lp64f=../lib/f32$\ ++ mabi.lp64f=../lib64/f32$\ + $(call if_multiarch,:loongarch64-linux-gnuf32) + + MULTILIB_OSDIRNAMES += \ +- mabi.lp64s=../lib/sf$\ ++ mabi.lp64s=../lib64/sf$\ + $(call if_multiarch,:loongarch64-linux-gnusf) + + endif +-- +2.33.3 +