diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index b4cca3b..8a71765 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -3,17 +3,22 @@ # Disable LTO in userspace packages. %global _lto_cflags %{nil} +%ifarch x86_64 +%define with_toolchain_clang 1 +%define with_clang_lto 1 +%endif + # Option to enable compiling with clang instead of gcc. %bcond_with toolchain_clang -%if %{with toolchain_clang} +%if %{with_toolchain_clang} %global toolchain clang %endif # Compile the kernel with LTO (only supported when building with clang). %bcond_with clang_lto -%if %{with clang_lto} && %{without toolchain_clang} +%if %{with_clang_lto} && %{without_toolchain_clang} {error:clang_lto requires --with toolchain_clang} %endif @@ -63,7 +68,7 @@ %endif # Set pkg_release. -%global pkg_release 4%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing +%global pkg_release 5%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing # Architectures upon which we can sign the kernel # for secure boot authentication. @@ -170,14 +175,12 @@ %define _use_vdso 0 %endif -%if %{with toolchain_clang} -%ifarch aarch64 noarch -%global llvm_ias 0 -%else +%if %{with_toolchain_clang} + %global llvm_ias 1 -%endif + %global clang_make_opts HOSTCC=clang CC=clang LLVM_IAS=%{llvm_ias} -%if %{with clang_lto} +%if %{with_clang_lto} %global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm %endif %global make_opts %{make_opts} %{clang_make_opts} @@ -1797,6 +1800,9 @@ fi %endif %changelog +* Mon Feb 10 2025 Eduard Basov - 6.1.124-5.lvc13.inferit.fuzzing +- Change macros + * Mon Feb 10 2025 Eduard Basov - 6.1.124-4.lvc13.inferit.fuzzing - Added build ALL Kernel with clang