diff --git a/llvm14-fix-segfault-on-aarch64.patch b/llvm14-fix-segfault-on-aarch64.patch
new file mode 100644
index 0000000..80f7954
--- /dev/null
+++ b/llvm14-fix-segfault-on-aarch64.patch
@@ -0,0 +1,31 @@
+From 2e1b838a889f9793d4bcd5dbfe10db9796b77143 Mon Sep 17 00:00:00 2001
+From: Graham Markall <gmarkall@nvidia.com>
+Date: Mon, 3 Apr 2023 11:15:36 -0700
+Subject: [PATCH] [RuntimeDyld] RuntimeDyldELF: Clear GOTOffsetMap when
+ resetting GOT section.
+
+When the GOT section ID is reset, the GOTOffsetMap must also be cleared,
+otherwise spurious matches can be located when handling GOT relocations
+in subsequently-linked objects.
+
+Fixes Issue #61402 - see https://github.com/llvm/llvm-project/issues/61402.
+
+Reviewed By: lhames
+
+Differential Revision: https://reviews.llvm.org/D146938
+---
+ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+index 3c7f4ec47eb84..282c357f2de2c 100644
+--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
++++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+@@ -2406,6 +2406,7 @@ Error RuntimeDyldELF::finalizeLoad(const ObjectFile &Obj,
+     }
+   }
+ 
++  GOTOffsetMap.clear();
+   GOTSectionID = 0;
+   CurrentGOTIndex = 0;
+ 
diff --git a/llvm14.changes b/llvm14.changes
index 4c56d43..afe2932 100644
--- a/llvm14.changes
+++ b/llvm14.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 15 23:45:39 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Make python3-clang noarch again and fix conflicts/provides to
+  point to %python3_sitelib instead of %python3_sitearch.
+
+-------------------------------------------------------------------
+Tue Jun 13 08:13:42 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add patch to fix segmentation fault on aarch64 - boo#1212264:
+  * llvm14-fix-segfault-on-aarch64.patch
+
 -------------------------------------------------------------------
 Fri May  5 21:48:49 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm14.spec b/llvm14.spec
index 09db867..d8ed6de 100644
--- a/llvm14.spec
+++ b/llvm14.spec
@@ -381,6 +381,8 @@ Patch36:        clang-test-xfail-gnuless-triple.patch
 Patch37:        llvm-preserve-symbols-used.patch
 # Fix build with Swig 4.1.0: backport of upstream commits 81fc5f7909a4, f0a25fe0b746. (gh#llvm/llvm-project#58018)
 Patch38:        lldb-swig-4.1.0-build-fix.patch
+# Cherry pick from rust llvm project (https://reviews.llvm.org/D146938) - boo#1212264
+Patch39:        llvm14-fix-segfault-on-aarch64.patch
 BuildRequires:  binutils-devel >= 2.21.90
 BuildRequires:  cmake >= 3.13.4
 BuildRequires:  fdupes
@@ -675,8 +677,9 @@ Summary:        Python bindings for libclang
 Group:          Development/Libraries/Python
 Requires:       libclang%{_soclang} >= %{version}
 Requires:       python3-base
-Conflicts:      %{python3_sitearch}/clang/
-Provides:       %{python3_sitearch}/clang/
+Conflicts:      %{python3_sitelib}/clang/
+Provides:       %{python3_sitelib}/clang/
+BuildArch:      noarch
 
 %description -n python3-clang%{_sonum}
 This package contains the Python bindings to clang (C language)
@@ -811,6 +814,7 @@ This package contains the development files for Polly.
 %patch27 -p2
 %patch33 -p2
 %patch37 -p2
+%patch39 -p2
 
 pushd clang-%{_version}.src
 %patch2 -p1