diff --git a/.clang.metadata b/.clang.metadata index 1e702fb..a2655c0 100644 --- a/.clang.metadata +++ b/.clang.metadata @@ -1,3 +1,3 @@ -517d56ccc605a9f180266f8fbe742599d743b82a SOURCES/clang-14.0.0.src.tar.xz -676c15c96fece5bdf7ed5eaf08f6f4c1ecfa8898 SOURCES/clang-tools-extra-14.0.0.src.tar.xz +88442d295bc0b96df7cf3d526ed9eabd7a214ac2 SOURCES/clang-14.0.6.src.tar.xz +dac5046f0eb81e6c47432cf80229599befbf273e SOURCES/clang-tools-extra-14.0.6.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/.gitignore b/.gitignore index a8a37c0..be7fa0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/clang-14.0.0.src.tar.xz -SOURCES/clang-tools-extra-14.0.0.src.tar.xz +SOURCES/clang-14.0.6.src.tar.xz +SOURCES/clang-tools-extra-14.0.6.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/clang-14.0.0.src.tar.xz.sig b/SOURCES/clang-14.0.0.src.tar.xz.sig deleted file mode 100644 index 12f7c85..0000000 Binary files a/SOURCES/clang-14.0.0.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/clang-14.0.6.src.tar.xz.sig b/SOURCES/clang-14.0.6.src.tar.xz.sig new file mode 100644 index 0000000..3f0ecf4 Binary files /dev/null and b/SOURCES/clang-14.0.6.src.tar.xz.sig differ diff --git a/SOURCES/clang-tools-extra-14.0.0.src.tar.xz.sig b/SOURCES/clang-tools-extra-14.0.0.src.tar.xz.sig deleted file mode 100644 index 1a9e464..0000000 Binary files a/SOURCES/clang-tools-extra-14.0.0.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/clang-tools-extra-14.0.6.src.tar.xz.sig b/SOURCES/clang-tools-extra-14.0.6.src.tar.xz.sig new file mode 100644 index 0000000..9559103 Binary files /dev/null and b/SOURCES/clang-tools-extra-14.0.6.src.tar.xz.sig differ diff --git a/SOURCES/m-branch-protection.patch b/SOURCES/m-branch-protection.patch deleted file mode 100644 index 7586c7d..0000000 --- a/SOURCES/m-branch-protection.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit fed96f31bb5b68f77dd617ee8e698dd8171ee71b -Author: Tom Stellard -Date: Tue Mar 22 23:17:39 2022 -0700 - - Re-commit: Driver: Don't warn on -mbranch-protection when linking - - This is a re-commit of 98fd3b359866f474ab1c097c22fb5c3be356b996. The - newly added test was failing on the bots, and I've fixed the test now so - that it doesn't actually invoke the linker. - -diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td -index d37d3a31fe07..6ed87f9a464d 100644 ---- a/clang/include/clang/Driver/Options.td -+++ b/clang/include/clang/Driver/Options.td -@@ -3444,6 +3444,7 @@ def msign_return_address_EQ : Joined<["-"], "msign-return-address=">, - Flags<[CC1Option]>, Group, Values<"none,all,non-leaf">, - HelpText<"Select return address signing scope">; - def mbranch_protection_EQ : Joined<["-"], "mbranch-protection=">, -+ Group, - HelpText<"Enforce targets of indirect branches and function returns">; - - def mharden_sls_EQ : Joined<["-"], "mharden-sls=">, -diff --git a/clang/test/Driver/aarch64-security-options.c b/clang/test/Driver/aarch64-security-options.c -index 6ea4b8ae5838..4bd73e06d255 100644 ---- a/clang/test/Driver/aarch64-security-options.c -+++ b/clang/test/Driver/aarch64-security-options.c -@@ -27,6 +27,9 @@ - // RUN: %clang -target aarch64--none-eabi -c %s -### -mbranch-protection=bar 2>&1 | \ - // RUN: FileCheck %s --check-prefix=BAD-BP-PROTECTION --check-prefix=WARN - -+// RUN: %clang -target aarch64--none-eabi -### -o /dev/null -mbranch-protection=standard /dev/null 2>&1 | \ -+// RUN: FileCheck --allow-empty %s --check-prefix=LINKER-DRIVER -+ - // WARN-NOT: warning: ignoring '-mbranch-protection=' option because the 'aarch64' architecture does not support it [-Wbranch-protection] - - // RA-OFF: "-msign-return-address=none" -@@ -46,3 +49,7 @@ - - // BAD-B-KEY-COMBINATION: invalid branch protection option 'b-key' in '-mbranch-protection={{.*}}' - // BAD-LEAF-COMBINATION: invalid branch protection option 'leaf' in '-mbranch-protection={{.*}}' -+ -+// Check that the linker driver doesn't warn about -mbranch-protection=standard -+// as an unused option. -+// LINKER-DRIVER-NOT: warning: diff --git a/SPECS/clang.spec b/SPECS/clang.spec index 7f5dd87..2820e6c 100644 --- a/SPECS/clang.spec +++ b/SPECS/clang.spec @@ -3,7 +3,7 @@ %global maj_ver 14 %global min_ver 0 -%global patch_ver 0 +%global patch_ver 6 #global rc_ver 4 %global clang_version %{maj_ver}.%{min_ver}.%{patch_ver} @@ -41,7 +41,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -65,8 +65,6 @@ Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch # This patch can be dropped once gcc-12.0.1-0.5.fc36 is in the repo. Patch5: 0001-Work-around-gcc-miscompile.patch -# https://github.com/llvm/llvm-project/commit/fed96f31bb5b68f77dd617ee8e698dd8171ee71b -Patch6: m-branch-protection.patch Patch7: 0010-PATCH-clang-Produce-DWARF4-by-default.patch Patch8: disable-recommonmark.patch @@ -613,6 +611,9 @@ false %endif %changelog +* Tue Jun 28 2022 Tom Stellard - 14.0.6-1 +- 14.0.6 Release + * Wed Jun 01 2022 Timm Bäder - 14.0.0-2 - Increate gcc-toolset dependency to 12 - Set GCC_INSTALL_PREFIX variable