diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata
index 9515b12..2dfa898 100644
--- a/.compiler-rt.metadata
+++ b/.compiler-rt.metadata
@@ -1,2 +1,2 @@
-b0f7f43251829aafd07a3b09a9c3e4987cfa9204 SOURCES/compiler-rt-17.0.6.src.tar.xz
-5df8c5479d1c6e99092b865f3597afac8bff1432 SOURCES/compiler-rt-17.0.6.src.tar.xz.sig
+6ecbfa5516b60adb4e4e60f991b0d8ddf5aab12a SOURCES/compiler-rt-18.1.8.src.tar.xz
+7aa7c3702e6f12f4426c83a232de1349eacbadf2 SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
diff --git a/.gitignore b/.gitignore
index f70ac84..661052b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/compiler-rt-17.0.6.src.tar.xz
-SOURCES/compiler-rt-17.0.6.src.tar.xz.sig
+SOURCES/compiler-rt-18.1.8.src.tar.xz
+SOURCES/compiler-rt-18.1.8.src.tar.xz.sig
diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec
index 50690e3..3d971be 100644
--- a/SPECS/compiler-rt.spec
+++ b/SPECS/compiler-rt.spec
@@ -8,9 +8,15 @@
 
 %global toolchain clang
 
-%global maj_ver 17
-%global min_ver 0
-%global patch_ver 6
+# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
+%undefine _include_frame_pointers
+
+%bcond_with compat_build
+
+%global maj_ver 18
+%global min_ver 1
+%global patch_ver 8
 #global rc_ver 4
 %if %{with snapshot_build}
 %global maj_ver %{llvm_snapshot_version_major}
@@ -22,13 +28,19 @@
 
 %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
 
+%if %{with compat_build}
+%global pkg_name compiler-rt%{maj_ver}
+%else
+%global pkg_name compiler-rt
+%endif
+
 # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
 
 # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93615
 %global optflags %(echo %{optflags} -Dasm=__asm__)
 
-Name:		compiler-rt
+Name:		%{pkg_name}
 Version:	%{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
 Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
@@ -60,6 +72,7 @@ BuildRequires:	zlib-devel
 BuildRequires:	gnupg2
 
 Requires: clang-resource-filesystem%{?isa} = %{version}
+Provides: %{name}(major) = %{maj_ver}
 
 %description
 The compiler-rt project is a part of the LLVM project. It provides
@@ -108,13 +121,20 @@ export ASMFLAGS=$CFLAGS
 # by clang.
 mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/ppc64le-redhat-linux-gnu
 %endif
+%ifarch %{ix86}
+# Fix install path on ix86 so that the directory name matches the triple used
+# by clang on both actual ix86 and on x86_64 with -m32:
+%if "%{_target_cpu}" != "i386"
+ln -s i386-redhat-linux-gnu %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/%{_target_cpu}-redhat-linux-gnu
+%endif
+%endif
 
 %check
 #%%cmake_build --target check-compiler-rt
 
 %files
 %license LICENSE.TXT
-%ifarch x86_64 aarch64
+%ifarch x86_64 aarch64 riscv64
 %{_prefix}/lib/clang/%{maj_ver}/bin/*
 %endif
 %{_prefix}/lib/clang/%{maj_ver}/include/*
@@ -127,6 +147,15 @@ mv %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/lib/powerpc64le-redhat-linux-gnu
 %changelog
 %{?llvm_snapshot_changelog_entry}
 
+* Wed Jul 17 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-1
+- Update to 18.1.8
+
+* Tue Jun 11 2024 Nikita Popov <npopov@redhat.com> - 18.1.6-2
+- Rebuild with new clang
+
+* Sun Jun 02 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.6-1
+- Update to 18.1.6
+
 * Mon Dec 11 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-1
 - Update to 17.0.6