Remove separate lto_cflags for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Fix merge
2023-12-04 07:59:42 +02:00 · 2023-12-04 07:58:35 +02:00 · 2023-12-04 07:57:39 +02:00 · 2023-11-28 16:01:06 -03:00 · 2023-11-24 14:14:14 -03:00 · 2023-11-24 14:10:14 -03:00
2 changed files with 18 additions and 40 deletions
--- a/llvm.spec
+++ b/llvm.spec
@ -14,7 +14,7 @@
 %undefine _include_frame_pointers

 # 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
@ -40,7 +40,7 @@

 %global maj_ver 17
 %global min_ver 0
-%global patch_ver 4
+%global patch_ver 6
 #global rc_ver 4

 %if %{with snapshot_build}
@ -53,12 +53,6 @@
 %global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
 %global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
 %global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
-%ifnarch riscv64
-%global _lto_cflags -flto=thin
-%else
-# riscv64: gold is not supported on riscv64
-%global _lto_cflags %{nil}
-%endif

 %if %{with compat_build}
 %global pkg_name llvm%{maj_ver}
@ -94,13 +88,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
@ -109,7 +97,7 @@

 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1.2.riscv64%{?dist}
+Release:	1.0.riscv64%{?dist}
 Summary:	The Low Level Virtual Machine

 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@ -281,7 +269,7 @@ mv %{third_party_srcdir} third-party
 %global _lto_cflags %nil
 %endif

-%ifarch s390 s390x %{arm} %ix86 riscv64
+%ifarch s390 s390x %ix86 riscv64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
@ -296,7 +284,7 @@ export ASMFLAGS="%{build_cflags}"
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 %{arm} %ix86 riscv64
+%ifarch s390 %ix86 riscv64
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@ -476,14 +464,6 @@ mkdir -p %{buildroot}%{pkg_datadir}/llvm/cmake
 cp -Rv ../cmake/* %{buildroot}%{pkg_datadir}/llvm/cmake

 %check
-# 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 test/tools/llvm-readobj/ELF/dependent-libraries.test
-%endif

 # non reproducible errors
 rm test/tools/dsymutil/X86/swift-interface.test
@ -493,8 +473,6 @@ rm test/tools/dsymutil/X86/swift-interface.test
 LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C %{_vpath_builddir}
 %endif

-%endif
-
 %ldconfig_scriptlets libs

 %post devel
@ -618,17 +596,17 @@ fi
 %changelog
 %{?llvm_snapshot_changelog_entry}

-* Sun Nov 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.4-1.2.riscv64
- Rebuild with Clang
-
-* Fri Nov 03 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.4-1.1.riscv64
+* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.6-1.0.riscv64
 - Disable LTO build
- Build with GCC
-
-* Thu Nov 02 2023 David Abdurachmanov <davidlt@rivosinc.com> - 17.0.4-1.0.riscv64
 - Disable tests on riscv64 for now
 - Lower memory consumption on riscv64

+* Tue Nov 28 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
+* Tue Nov 14 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.5-1
+- Update to LLVM 17.0.5
+
 * Tue Oct 31 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 17.0.4-1
 - Update to LLVM 17.0.4

--- a/12
+++ b/12
@ -1,6 +1,6 @@
-SHA512 (llvm-17.0.4.src.tar.xz) = 4736fd8d7ee9aacf1d959e78b98dc1b5e3235a233ce4094a8cb262b3f29d101332947e5abcd242ff680b5b91901637ab006ae720339be7dcf68c82b14ea2f266
-SHA512 (llvm-17.0.4.src.tar.xz.sig) = 1391cb19f4da73a564feb88da4f464887f89e886986b070dae1a0b926c64ee60181e8ae4e31278e09e76ee2164383e630e44145d025824adde413444567544d2
-SHA512 (cmake-17.0.4.src.tar.xz) = bddfa97e6d1866a571d036490321099593063be33c38be1c6d117ea26d311876526d13760dc63155d3a7ea460f9c3de6da9911bdebeb286964ccdab377085a28
-SHA512 (cmake-17.0.4.src.tar.xz.sig) = 6a0d25cdbf24ff0bdeb3c21dea413cfb72420954bafd2080dc865a015d7b688019b654d0865440b1eb464e251b25a13adec8d313dc0fec33f4f6b6bf7aec8942
-SHA512 (third-party-17.0.4.src.tar.xz) = 779bddf99829a9d0abdfe277855711a573fc95f135fa1e3eb2d1a51f9da680bc6973db2f29a238888c914c7e6381aabe5f91db01c06686aff37e5d28d8906f90
-SHA512 (third-party-17.0.4.src.tar.xz.sig) = 46e35713b0ff53f782b4e9d90ee8fc57271da29bb41af1f28f65a346354131f94088a28bbfc081e8fe4c13e3aa59582267384d48d96e029690e3e067f8219f08
+SHA512 (llvm-17.0.6.src.tar.xz) = bf9b04d0d45c67168b195c550cd8326e3a01176f92776705846aad3956a494bcb7a053b0b0bde19abd68dc0068e5c97ef99dee7eadfdb727bc0d758b2684f3bd
+SHA512 (llvm-17.0.6.src.tar.xz.sig) = 904066c34ec0adf5b9e789af640329cadc7919b111aca77fa3ce26450696bace20e299e2592251f96ee33fb83da603423cc0ca63a67ad627916fcab0bed59689
+SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a
+SHA512 (cmake-17.0.6.src.tar.xz.sig) = fad2d91fc3e499dbd1b8c4acbc48ef748c106a04f7529232ea95abf3d006c4494e495643f77e653b1c96f7a0b79fe0706c5cdedd4f7dc4cbbab0ee5cf749c8ce
+SHA512 (third-party-17.0.6.src.tar.xz) = 242dada4800c5e558f5f243e6aa0905d90ca3f82cc81baf14c60de543a7e737d4c2f3471122f2c641dc4f0724e4ebf5cf137761a231b34aab2a12f1cfc902c53
+SHA512 (third-party-17.0.6.src.tar.xz.sig) = 6b72379b70a359a77f4d7d0922b0e80ff2a44d65178389b25edbc4a72029a91d50b3eb39a1185fac50dbba0a1972572eaadc7d82bb8e87d26f4e42c2bf676b75
Author	SHA1	Message	Date
David Abdurachmanov	fe12fbf87f	Remove separate lto_cflags for riscv64 Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2023-12-04 07:59:42 +02:00
David Abdurachmanov	8d0bd1022d	Fix merge Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2023-12-04 07:58:35 +02:00
David Abdurachmanov	6ada3f3cfd	Merge remote-tracking branch 'up/main' into main-riscv64 Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2023-12-04 07:57:39 +02:00
Tulio Magno Quites Machado Filho	dae42895a5	Update to LLVM 17.0.6	2023-11-28 16:01:06 -03:00
Tulio Magno Quites Machado Filho	ceb6b17869	Revert "[packit] 17.0.5 upstream release" This reverts commit `fe235bbf25`. It was pushed by mistake.	2023-11-24 14:14:14 -03:00
Tulio Magno Quites Machado Filho	fe235bbf25	[packit] 17.0.5 upstream release Upstream tag: llvmorg-17.0.5 Upstream commit: 98bfdac5	2023-11-24 14:10:14 -03:00
Nikita Popov	4be4b92cb1	Remove 32-bit arm handling	2023-11-24 09:12:29 +00:00
Nikita Popov	ec966be7c4	Remove redundant _lto_cflags define ThinLTO is the default nowadays.	2023-11-24 09:12:29 +00:00
Tulio Magno Quites Machado Filho	5e17ea6380	Update to LLVM 17.0.5	2023-11-14 15:49:46 -03:00