From d92b4c2a53ea1ce8bb7a16a2ec4f48e00763031c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 29 Nov 2020 12:00:11 +0100 Subject: [PATCH 1/1] add support for %{arm} --- llvm-pld.patch | 16 ++++++++++++++++ llvm.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/llvm-pld.patch b/llvm-pld.patch index a78bf51..70733a0 100644 --- a/llvm-pld.patch +++ b/llvm-pld.patch @@ -8,6 +8,22 @@ "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", "aarch64-suse-linux", "aarch64-linux-android"}; static const char *const AArch64beLibDirs[] = {"/lib"}; +@@ -2056,9 +2056,13 @@ + "aarch64_be-linux-gnu"}; + + static const char *const ARMLibDirs[] = {"/lib"}; +- static const char *const ARMTriples[] = {"arm-linux-gnueabi", ++ static const char *const ARMTriples[] = {"arm-pld-linux-gnueabi", ++ "arm-linux-gnueabi", + "arm-linux-androideabi"}; +- static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", ++ static const char *const ARMHFTriples[] = {"arm-pld-linux-gnueabihf", ++ "armv6hl-pld-linux-gnueabi", ++ "armv7hl-pld-linux-gnueabi", ++ "arm-linux-gnueabihf", + "armv7hl-redhat-linux-gnueabi", + "armv6hl-suse-linux-gnueabi", + "armv7hl-suse-linux-gnueabi"}; @@ -2020,6 +2021,7 @@ static const char *const X86_64LibDirs[] = {"/lib64", "/lib"}; diff --git a/llvm.spec b/llvm.spec index 7ea0088..c54d36d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -115,7 +115,7 @@ BuildRequires: libstdc++-multilib-64-devel %endif %if %{with lldb} BuildRequires: epydoc -%ifarch i386 i486 +%ifarch i386 i486 %{arm} BuildRequires: libatomic-devel %endif BuildRequires: libxml2-devel >= 2 -- 2.44.0