Sync with stable:
This commit is contained in:
		
							parent
							
								
									e078d98d28
								
							
						
					
					
						commit
						2ac61aba1b
					
				| @ -1,2 +1,4 @@ | |||||||
| 40f2a886636168f6478e20933906bcece2fd6b97 SOURCES/compiler-rt-15.0.7.src.tar.xz | 0de534cfef38697e115c3ae80634765f05e78e5b SOURCES/cmake-16.0.6.src.tar.xz | ||||||
| 347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc | 2db5c88fe9277bb0fa85f49b58e946e49ff235c2 SOURCES/cmake-16.0.6.src.tar.xz.sig | ||||||
|  | 28ddc89aac54cbfa6d0a0cd07a14bbd3f3a01d5f SOURCES/compiler-rt-16.0.6.src.tar.xz | ||||||
|  | 7374cad6da4c3c936c26e72175bdff52ab3e98e5 SOURCES/compiler-rt-16.0.6.src.tar.xz.sig | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -1,2 +1,4 @@ | |||||||
| SOURCES/compiler-rt-15.0.7.src.tar.xz | SOURCES/cmake-16.0.6.src.tar.xz | ||||||
| SOURCES/release-keys.asc | SOURCES/cmake-16.0.6.src.tar.xz.sig | ||||||
|  | SOURCES/compiler-rt-16.0.6.src.tar.xz | ||||||
|  | SOURCES/compiler-rt-16.0.6.src.tar.xz.sig | ||||||
|  | |||||||
| @ -1,37 +0,0 @@ | |||||||
| commit b18bde7a9bd6ed80f5721c47c805f0158b4fe9f8 |  | ||||||
| Author: Timm Bäder <tbaeder@redhat.com> |  | ||||||
| Date:   Wed Mar 9 07:17:21 2022 +0100 |  | ||||||
| 
 |  | ||||||
|     [compiler-rt] Add LLVM cmake package in standalone builds |  | ||||||
|      |  | ||||||
|     So the other files from the toplevel cmake/Modules directory have a |  | ||||||
|     chance of being found. |  | ||||||
| 
 |  | ||||||
| diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
 |  | ||||||
| index 3a41aa43e406..6516e10fa3c5 100644
 |  | ||||||
| --- a/compiler-rt/CMakeLists.txt
 |  | ||||||
| +++ b/compiler-rt/CMakeLists.txt
 |  | ||||||
| @@ -28,6 +28,12 @@ else()
 |  | ||||||
|    set(CMAKE_CFG_RESOLVED_INTDIR "") |  | ||||||
|  endif() |  | ||||||
|   |  | ||||||
| +if(COMPILER_RT_STANDALONE_BUILD)
 |  | ||||||
| +  # Needed to find the other modules from the toplevel cmake/Modules dir
 |  | ||||||
| +  find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")
 |  | ||||||
| +  list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")
 |  | ||||||
| +endif()
 |  | ||||||
| +
 |  | ||||||
|  include(SetPlatformToolchainTools) |  | ||||||
|  include(base-config-ix) |  | ||||||
|  include(CompilerRTUtils) |  | ||||||
| diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
 |  | ||||||
| index 5c2b634e1180..098fb0481517 100644
 |  | ||||||
| --- a/compiler-rt/test/CMakeLists.txt
 |  | ||||||
| +++ b/compiler-rt/test/CMakeLists.txt
 |  | ||||||
| @@ -1,6 +1,3 @@
 |  | ||||||
| -# Needed for lit support in standalone builds.
 |  | ||||||
| -include(AddLLVM)
 |  | ||||||
| -
 |  | ||||||
|  option(COMPILER_RT_TEST_STANDALONE_BUILD_LIBS |  | ||||||
|    "When set to ON and testing in a standalone build, test the runtime \ |  | ||||||
|    libraries built by this standalone build rather than the runtime libraries \ |  | ||||||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										104
									
								
								SOURCES/release-keys.asc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								SOURCES/release-keys.asc
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,104 @@ | |||||||
|  | -----BEGIN PGP PUBLIC KEY BLOCK----- | ||||||
|  | 
 | ||||||
|  | mQGNBGLtemUBDADClvDIromq0Y4TX+wyRyYCq5WusPQheQuY8dVCXd9KhMpYAv8U | ||||||
|  | X15E5boH/quGpJ0ZlVkWcf+1WUHIrQWlbzQdIx514CDM7DBgO92CXsnn86kIMDW+ | ||||||
|  | 9S+Hkn8upbizT1fWritlHwzD9osz7ZQRq7ac03PPgw27tqeIizHGuG4VNLyhbbjA | ||||||
|  | w+0VLFSu3r219eevS+lzBIvR5U9W720jFxWxts4UvaGuD6XW1ErcsTvuhgyCKrrs | ||||||
|  | gxO5Ma/V7r0+lqRL688ZPr4HxthwsON1YCfpNiMZ6sgxT8rOE0qL/d07ItbnXxz6 | ||||||
|  | KdcNWIXamTJKJgag6Tl0gYX4KIuUCcivXaRdJtUcFFsveCorkdHkdGNos403XR89 | ||||||
|  | 5u9gq7Ef10Zahsv5GjE2DV5oFCEhXvfIWxvyeJa65iBkJafElb2stgUjkIut2a2u | ||||||
|  | +XmpKpwpGSFklce1ABLrmazlLjhsYiJVrz5l5ktoT9moE4GaF7Q5LD6JgsxzLE0U | ||||||
|  | Tzo9/AQPd8qG2REAEQEAAbQeVG9iaWFzIEhpZXRhIDx0b2JpYXNAaGlldGEuc2U+ | ||||||
|  | iQHUBBMBCAA+FiEE1XS9XR0OmIleO/kARPJIXkXVkEIFAmLtemUCGwMFCRLMAwAF | ||||||
|  | CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQRPJIXkXVkEKoNwv+MEMVzdnzJarx | ||||||
|  | ZJ0OzHrGJJG8/chkuoejTjCLG73li9yWQigy5KmvynB5yW0fk0PAQ90vvp2wr/Hd | ||||||
|  | mUh0Zda3CwF6sWlO3N6DEDjVA3lZUuofTtvMn/tdGvvOOXYXAP9N+SZfp/7q8dxX | ||||||
|  | zn5SA1AO87nXq5lrwVzlVzUCdwOeqDlJ+2U9VEqvukP/FdkgaR2bEb8Wm/h+encW | ||||||
|  | UIQEqPDE+qOyJ9dRaiL0CUI4x+1wXeXB3OA7VybF2LvaZDbMlocdy+vs825iUWfa | ||||||
|  | n8g3mE2TpV8jkc9UHgGGopzxqNquvkkIB7ZFZm/PSW40W3OeHKhYsZZbHrz9403t | ||||||
|  | 3R4SAzA3ApmMP/P8ue9irsbe24g3rzYMvck1w4C1a4Uy9buT0OCfA+dA16IRAPgV | ||||||
|  | 5SJEIS62cFbUxkw8el3rUK9V+6kwoq4k8Fs8f1U7DEnOKS/v8BJJCNEc1cvimZai | ||||||
|  | Y5/3r5BeneEmuZFKX4iIIfcn5PmLSDB4aw+gKAIAAus+E2DxBqE+uQGNBGLtemUB | ||||||
|  | DADBCNyvUdv0OV//6pQ/0YC2bYXL/ElF0rOjFFl4H7O3TRxgIz2C4nQJHUOrXSmo | ||||||
|  | iL7ldfUjoAMgebcoWDpgE8S2Vjw2Gd+UJBQXj+3J6dPKLBUCjj9CLyb5hwOHITMV | ||||||
|  | b9UC/E+iwpn4vgTbI6K1O847brkBC+GuDT4g9D3O3sRbja0GjN0n2yZiS8NtRQm1 | ||||||
|  | MXAVy1IffeXKpGLookAhoUArSN88koMe+4Nx6Qun4/aUcwz0P2QUr5MA5jUzFLy1 | ||||||
|  | R3M5p1nctX15oLOU33nwCWuyjvqkxAeAfJMlkKDKYX25u1R2RmQ4ju2kAbw0PiiZ | ||||||
|  | yYft8fGlrwT4/PB3AqfKeSpx8l9Vs15ePvcuJITauo3fhBjJ6Y4WCKlTG1FbDYUl | ||||||
|  | KvPhyGO8yLhtZJg3+LbA5M/CEHsDmUh7YEQVxM0RTQMTxNBVBF5IG/4y8v/+19DZ | ||||||
|  | 89VdpsQF3ThoPV0yh57YMemTBeIxpF9Swp5N7kUWct4872kBnXOmbp/jhU4MpLj6 | ||||||
|  | iLEAEQEAAYkBvAQYAQgAJhYhBNV0vV0dDpiJXjv5AETySF5F1ZBCBQJi7XplAhsM | ||||||
|  | BQkSzAMAAAoJEETySF5F1ZBCdPwL/3Ox6MwrKFzYJNz3NpQFpKFdDrkwhf25D/Qw | ||||||
|  | vu5e8Lql/q62NIhEKH3jxXXgoFYas2G7r8CSCRehraDqvXygbaiWUIkxSU0xuDTl | ||||||
|  | lNqHSkCRqIxhi/yxNm1Pk84NVGTLXWW0+CwT9cRwWn5foIPJhoDdZ732zJ7rcY3R | ||||||
|  | g71SJTe3R6MnGBzIF1LzT7Znwkh7YfcmeTfInareIWXpeNaeKy8KrQmr/0+5AIer | ||||||
|  | Ax1gu03o8GD5LFDUuGbESgDJU6nVtVyht7C6AlJWqSX6QS3+lPCw5BOCKbxakYNR | ||||||
|  | /oBNauzyDISdbUwzHM2d+XGCjBsXKRA0Tft2NlG6EC83/PuY2J9MSA2gg3iPHsiN | ||||||
|  | J5iipbdZNpZ3XL0l8/t/7T60nM7UZDqt3twLMA0eRFRlCnhMjvFE5Zgj5DE7BsJh | ||||||
|  | w2nCoGWkAcfeuih+jfyEjN24NK+sE/bM+krwVv430ewJwm1bVUqKrbOb9aa6V9gP | ||||||
|  | 9RmlwZlOTFGcWBYl/cfRONn9qi9a6w== | ||||||
|  | =Lvw+ | ||||||
|  | -----END PGP PUBLIC KEY BLOCK----- | ||||||
|  | -----BEGIN PGP PUBLIC KEY BLOCK----- | ||||||
|  | 
 | ||||||
|  | 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 | ||||||
|  | =tMzl | ||||||
|  | -----END PGP PUBLIC KEY BLOCK----- | ||||||
| @ -1,6 +1,10 @@ | |||||||
| %global compiler_rt_version 15.0.7 | %global maj_ver 16 | ||||||
| #global rc_ver 2 | %global min_ver 0 | ||||||
|  | %global patch_ver 6 | ||||||
|  | #global rc_ver 4 | ||||||
|  | %global compiler_rt_version %{maj_ver}.%{min_ver}.%{patch_ver} | ||||||
| %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src | %global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src | ||||||
|  | %global cmake_srcdir cmake-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src | ||||||
| 
 | 
 | ||||||
| # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 | # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 | ||||||
| %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) | %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) | ||||||
| @ -18,8 +22,8 @@ URL:		http://llvm.org | |||||||
| Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz | Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz | ||||||
| Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig | Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig | ||||||
| Source2:	release-keys.asc | Source2:	release-keys.asc | ||||||
| 
 | Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz | ||||||
| Patch0:		add-llvm-cmake-package.patch | Source4:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig | ||||||
| 
 | 
 | ||||||
| # RHEL-specific patches | # RHEL-specific patches | ||||||
| Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch | Patch100:	0001-Drop-fno-stack-protector-from-the-compiler-flags.patch | ||||||
| @ -47,17 +51,27 @@ instrumentation, and Blocks C language extension. | |||||||
| 
 | 
 | ||||||
| %prep | %prep | ||||||
| %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' | ||||||
|  | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}' | ||||||
|  | %setup -T -q -b 3 -n %{cmake_srcdir} | ||||||
|  | # TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir}, | ||||||
|  | # but this is not a CACHED variable, so we can't actually set it externally :( | ||||||
|  | cd .. | ||||||
|  | mv %{cmake_srcdir} cmake | ||||||
|  | 
 | ||||||
| %autosetup -n %{crt_srcdir} -p2 | %autosetup -n %{crt_srcdir} -p2 | ||||||
| 
 | 
 | ||||||
| %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize | %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize | ||||||
| 
 | 
 | ||||||
| %build | %build | ||||||
|  | # Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files. | ||||||
|  | export ASMFLAGS=$CFLAGS | ||||||
| mkdir -p %{_vpath_builddir} | mkdir -p %{_vpath_builddir} | ||||||
| cd %{_vpath_builddir} | cd %{_vpath_builddir} | ||||||
| 
 | 
 | ||||||
| %cmake .. -GNinja \ | %cmake .. -GNinja \ | ||||||
| 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||||||
| 	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \ | 	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \ | ||||||
|  | 	-DCMAKE_SKIP_RPATH:BOOL=ON \ | ||||||
| 	\ | 	\ | ||||||
| %if 0%{?__isa_bits} == 64 | %if 0%{?__isa_bits} == 64 | ||||||
| 	-DLLVM_LIBDIR_SUFFIX=64 \ | 	-DLLVM_LIBDIR_SUFFIX=64 \ | ||||||
| @ -74,15 +88,15 @@ cd %{_vpath_builddir} | |||||||
| %cmake_install | %cmake_install | ||||||
| 
 | 
 | ||||||
| # move blacklist/abilist files to where clang expect them | # move blacklist/abilist files to where clang expect them | ||||||
| mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share | mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/share | ||||||
| mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/ | mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{maj_ver}/share/ | ||||||
| 
 | 
 | ||||||
| # move sanitizer libs to better place | # move sanitizer libs to better place | ||||||
| %global libclang_rt_installdir lib/linux | %global libclang_rt_installdir lib/linux | ||||||
| mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib | mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib | ||||||
| mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib | mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*_rt* %{buildroot}%{_libdir}/clang/%{maj_ver}/lib | ||||||
| mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/ | mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib/linux/ | ||||||
| pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib | pushd %{buildroot}%{_libdir}/clang/%{maj_ver}/lib | ||||||
| for i in *.a *.so | for i in *.a *.so | ||||||
| do | do | ||||||
| 	ln -s ../$i linux/$i | 	ln -s ../$i linux/$i | ||||||
| @ -92,11 +106,11 @@ done | |||||||
| # the symlinks will be dangling if the 32 bits version is not installed, but that should be fine | # the symlinks will be dangling if the 32 bits version is not installed, but that should be fine | ||||||
| %ifarch x86_64 | %ifarch x86_64 | ||||||
| 
 | 
 | ||||||
| mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{compiler_rt_version}/lib/linux | mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{maj_ver}/lib/linux | ||||||
| for i in *.a *.so | for i in *.a *.so | ||||||
| do | do | ||||||
| 	target=`echo "$i" | sed -e 's/x86_64/i386/'` | 	target=`echo "$i" | sed -e 's/x86_64/i386/'` | ||||||
| 	ln -s ../../../../../lib/clang/%{compiler_rt_version}/lib/$target ../../../../%{_lib}/clang/%{compiler_rt_version}/lib/linux/ | 	ln -s ../../../../../lib/clang/%{maj_ver}/lib/$target ../../../../%{_lib}/clang/%{maj_ver}/lib/linux/ | ||||||
| done | done | ||||||
| 
 | 
 | ||||||
| %endif | %endif | ||||||
| @ -110,13 +124,19 @@ popd | |||||||
| %files | %files | ||||||
| %license LICENSE.TXT | %license LICENSE.TXT | ||||||
| %{_includedir}/* | %{_includedir}/* | ||||||
| %{_libdir}/clang/%{compiler_rt_version}/lib/* | %{_libdir}/clang/%{maj_ver}/lib/* | ||||||
| %{_libdir}/clang/%{compiler_rt_version}/share/* | %{_libdir}/clang/%{maj_ver}/share/* | ||||||
| %ifarch x86_64 aarch64 | %ifarch x86_64 aarch64 | ||||||
| %{_bindir}/hwasan_symbolize | %{_bindir}/hwasan_symbolize | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * Fri Jun 23 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1 | ||||||
|  | - 16.0.6 Release | ||||||
|  | 
 | ||||||
|  | * Thu Apr 13 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-1 | ||||||
|  | - Update to LLVM 16.0.0 | ||||||
|  | 
 | ||||||
| * Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1 | * Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1 | ||||||
| - Update to LLVM 15.0.7 | - Update to LLVM 15.0.7 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user