From c1ee2896c095267488108eaa2d7e952b4955811b Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Thu, 30 May 2024 10:18:56 +0200
Subject: [PATCH] Remove 32-bit arm related conditionals

32-bit ARM hasn't been supported for quite a while, remove the
related conditions. This has already happened for the non-big-merge
branches.
---
 build.spec.inc    |  9 +++------
 check.spec.inc    | 10 ----------
 files.spec.inc    |  8 ++------
 globals.spec.inc  |  8 +-------
 packages.spec.inc |  5 -----
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/build.spec.inc b/build.spec.inc
index a027314..0e6db0f 100644
--- a/build.spec.inc
+++ b/build.spec.inc
@@ -1,5 +1,5 @@
-# TODO(kkleine): In clang we had this %ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le
-%ifarch s390 s390x %{arm} %ix86
+# TODO(kkleine): In clang we had this %ifarch s390 s390x aarch64 %ix86 ppc64le
+%ifarch s390 s390x %ix86
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@@ -67,9 +67,6 @@ cd llvm
 	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
 	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../clang-tools-extra \
 	-DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{pkg_name_clang}/ \
-%ifarch %{arm}
-	-DCLANG_DEFAULT_LINKER=lld \
-%endif
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc \
 	\
 	\
@@ -112,7 +109,7 @@ cd llvm
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 %{arm} %ix86
+%ifarch s390 %ix86
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
diff --git a/check.spec.inc b/check.spec.inc
index b79aa69..6292ae9 100644
--- a/check.spec.inc
+++ b/check.spec.inc
@@ -1,14 +1,6 @@
 # TODO(kkleine): Instead of deleting test files we should mark them as expected
 # to fail. See https://llvm.org/docs/CommandGuide/lit.html#cmdoption-lit-xfail
 
-# Disable check section on arm due to some kind of memory related failure.
-# Possibly related to https://bugzilla.redhat.com/show_bug.cgi?id=1920183
-%ifnarch %{arm}
-
-# TODO: Fix the failures below
-%ifarch %{arm}
-rm llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test
-%endif
 %ifarch ppc64le
 # TODO: Re-enable when ld.gold fixed its internal error.
 rm llvm/test/tools/gold/PowerPC/mtriple.ll
@@ -224,5 +216,3 @@ cd llvm
 %endif
 
 #endregion
-
-%endif
diff --git a/files.spec.inc b/files.spec.inc
index a85cf30..640a679 100644
--- a/files.spec.inc
+++ b/files.spec.inc
@@ -541,10 +541,8 @@
 %license openmp/LICENSE.TXT
 %{_libdir}/libomp.so
 %{_libdir}/libompd.so
-%ifnarch %{arm}
 %{_libdir}/libarcher.so
-%endif
-%ifnarch %{ix86} %{arm}
+%ifnarch %{ix86}
 # libomptarget is not supported on 32-bit systems.
 # s390x does not support the offloading plugins.
 %{_libdir}/libomptarget.so.%{so_suffix}
@@ -554,13 +552,11 @@
 %license openmp/LICENSE.TXT
 %{_prefix}/lib/clang/%{maj_ver}/include/omp.h
 %{_prefix}/lib/clang/%{maj_ver}/include/ompx.h
-%ifnarch %{arm}
 %{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
 %{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
 %{_prefix}/lib/clang/%{maj_ver}/include/ompt-multiplex.h
-%endif
 %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
-%ifnarch %{ix86} %{arm}
+%ifnarch %{ix86}
 # libomptarget is not supported on 32-bit systems.
 # s390x does not support the offloading plugins.
 %{_libdir}/libomptarget.devicertl.a
diff --git a/globals.spec.inc b/globals.spec.inc
index cafcec7..d3dacfe 100644
--- a/globals.spec.inc
+++ b/globals.spec.inc
@@ -1,6 +1,6 @@
 %bcond_without snapshot_build
 # Components enabled if supported by target architecture:
-%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
+%define gold_arches %{ix86} x86_64 aarch64 %{power64} s390x
 %ifarch %{gold_arches}
   %bcond_without gold
 %else
@@ -76,13 +76,7 @@
 %global _dwz_low_mem_die_limit_s390x 1
 %global _dwz_max_die_limit_s390x 1000000
 
-%ifarch %{arm}
-# koji overrides the _gnu variable to be gnu, which is not correct for clang, so
-# we need to hard-code the correct triple here.
-%global llvm_triple armv7l-redhat-linux-gnueabihf
-%else
 %global llvm_triple %{_target_platform}
-%endif
 
 # https://fedoraproject.org/wiki/Changes/PythonSafePath#Opting_out
 # Don't add -P to Python shebangs
diff --git a/packages.spec.inc b/packages.spec.inc
index f47be45..b17f3a0 100644
--- a/packages.spec.inc
+++ b/packages.spec.inc
@@ -154,11 +154,6 @@ Recommends: libatomic%{?_isa}
 Recommends: libomp-devel%{_isa} = %{version}
 Recommends: libomp%{_isa} = %{version}
 
-# Use lld as the default linker on ARM due to rhbz#1918924
-%ifarch %{arm}
-Requires: lld
-%endif
-
 %description -n %{pkg_name_clang}-libs
 Runtime library for clang.