From 773f8502831f9137864b708968b1fd6f41607bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Fri, 27 Mar 2020 04:57:05 +0300 Subject: [PATCH] Updated to 10.0.0 --- .abf.yml | 10 ++-- compiler-rt-sanitizers-9.0.1-glibc-2.31.patch | 48 ------------------- llvm.spec | 25 ++-------- 3 files changed, 10 insertions(+), 73 deletions(-) delete mode 100644 compiler-rt-sanitizers-9.0.1-glibc-2.31.patch diff --git a/.abf.yml b/.abf.yml index ca882dc..f2e93d1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - clang-9.0.1.src.tar.xz: 0d72ce018c85c54fc709c7da71d3dd1463af0bfc - clang-tools-extra-9.0.1.src.tar.xz: f0571ec2135cb735f22baa149ac84e7334d0ac70 - compiler-rt-9.0.1.src.tar.xz: b35bc6ed7ce40f18ac45c81f4cf02ffd1f14de82 - llvm-9.0.1.src.tar.xz: f7fcf3bd92d130784513c06efe6910f135372ce3 - polly-9.0.1.src.tar.xz: e7ce627133584db555c5bd980418f96a9684a58f + clang-10.0.0.src.tar.xz: cfaa4c4e89a45b604e6f3057f984d73365074727 + clang-tools-extra-10.0.0.src.tar.xz: e41467d4e8c6afe917c9f9c44b1d6a95a85adadb + compiler-rt-10.0.0.src.tar.xz: 4744490da9c1186ba7f730d8a8f4fa4b0d4ee0bc + llvm-10.0.0.src.tar.xz: 85f2d89205fb190c61c8a98dad2a58e27a1540da + polly-10.0.0.src.tar.xz: 6ca3cd10f134a5418951410f26154d27bd9e0005 diff --git a/compiler-rt-sanitizers-9.0.1-glibc-2.31.patch b/compiler-rt-sanitizers-9.0.1-glibc-2.31.patch deleted file mode 100644 index 14e0239..0000000 --- a/compiler-rt-sanitizers-9.0.1-glibc-2.31.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index b7fa6e8..abdf794 100644 ---- llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1126,8 +1126,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -index f1a4fd7..029a209 100644 ---- llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ llvm-9.0.0.src/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -203,26 +203,13 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) diff --git a/llvm.spec b/llvm.spec index 46ed278..cee2d6b 100644 --- a/llvm.spec +++ b/llvm.spec @@ -11,9 +11,9 @@ %bcond_without clang -%define maj_ver 9 +%define maj_ver 10 %define major_ver %{maj_ver}.0 -%define minor_ver 1 +%define minor_ver 0 %define major %{major_ver} %define lto_major %{maj_ver} @@ -55,8 +55,6 @@ Source1011: clang-gcc-wrapper.sh # Adjust the search paths to match the OS, adjust the default compiler flags # as well. Patch1: clang-rosa.patch -# https://bugs.gentoo.org/708430 -Patch3: compiler-rt-sanitizers-9.0.1-glibc-2.31.patch BuildRequires: binutils-devel BuildRequires: bison @@ -260,22 +258,10 @@ as libraries and designed to be loosely-coupled and extensible. %{_bindir}/clang* %{_bindir}/diagtool %{_bindir}/hmaptool -%{_datadir}/clang/bash-autocomplete.sh -%{_datadir}/clang/clang-gcc-wrapper.sh -%{_datadir}/clang/clang-include-fixer.el -%{_datadir}/clang/clang-include-fixer.py -%{_datadir}/clang/clang-rename.el -%{_datadir}/clang/clang-rename.py -%{_datadir}/clang/clang-tidy-diff.py -%{_datadir}/clang/run-clang-tidy.py -%{_datadir}/clang/run-find-all-symbols.py +%{_bindir}/pp-trace +%{_datadir}/clang/ %if %{mdvver} >= 201910 -%{_datadir}/clang/__pycache__/clang-rename.cpython-38.opt-1.pyc -%{_datadir}/clang/__pycache__/clang-rename.cpython-38.pyc -%{_datadir}/clang/__pycache__/clang-tidy-diff.cpython-38.opt-1.pyc -%{_datadir}/clang/__pycache__/clang-tidy-diff.cpython-38.pyc -%{_datadir}/clang/__pycache__/run-clang-tidy.cpython-38.opt-1.pyc -%{_datadir}/clang/__pycache__/run-clang-tidy.cpython-38.pyc +%{_datadir}/clang/__pycache__/ %endif %{_rpmmacrodir}/*clang-gcc-wrapper* %endif @@ -364,7 +350,6 @@ cd tools/clang %patch1 -p1 -b .rosa~ cd - %endif -%patch3 -p1 -b .c-rt~ %build %global optflags %{optflags} -fno-strict-aliasing