From dbc386190b5805f9c4c9fb074dabe55de4bacef6 Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Fri, 14 Dec 2018 07:32:21 +0000 Subject: [PATCH] No longer ignore -fstack-clash-protection option incompatibility --- ...ility-Ignore-fstack-clash-protection.patch | 42 ------------------- clang.spec | 7 ++-- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 0001-GCC-compatibility-Ignore-fstack-clash-protection.patch diff --git a/0001-GCC-compatibility-Ignore-fstack-clash-protection.patch b/0001-GCC-compatibility-Ignore-fstack-clash-protection.patch deleted file mode 100644 index 5683b71..0000000 --- a/0001-GCC-compatibility-Ignore-fstack-clash-protection.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 428ca4520a79ec5a6df9c6adc8b8069623868cdb Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Fri, 26 Jan 2018 11:38:04 -0800 -Subject: [PATCH] GCC compatibility: Ignore -fstack-clash-protection - -Reviewers: sylvestre.ledru - -Subscribers: cfe-commits - -Differential Revision: https://reviews.llvm.org/D42593 ---- - include/clang/Driver/Options.td | 1 + - test/Driver/clang_f_opts.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td -index 41f31cf..e9078a2 100644 ---- a/include/clang/Driver/Options.td -+++ b/include/clang/Driver/Options.td -@@ -2705,6 +2705,7 @@ defm single_precision_constant : BooleanFFlag<"single-precision-constant">, - Group; - defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group; - defm stack_check : BooleanFFlag<"stack-check">, Group; -+defm stack_clash_protection : BooleanFFlag<"stack-clash-protection">, Group; - defm strength_reduce : - BooleanFFlag<"strength-reduce">, Group; - defm tls_model : BooleanFFlag<"tls-model">, Group; -diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c -index 5755c5d..8710ff4 100644 ---- a/test/Driver/clang_f_opts.c -+++ b/test/Driver/clang_f_opts.c -@@ -284,6 +284,7 @@ - // RUN: -ffriend-injection \ - // RUN: -fno-implement-inlines -fimplement-inlines \ - // RUN: -fstack-check \ -+// RUN: -fstack-clash-protection \ - // RUN: -fforce-addr \ - // RUN: -malign-functions=100 \ - // RUN: -malign-loops=100 \ --- -1.8.3.1 - diff --git a/clang.spec b/clang.spec index 3e334ff..e5e8f99 100644 --- a/clang.spec +++ b/clang.spec @@ -57,7 +57,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 8%{?dist} +Release: 9%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -68,7 +68,6 @@ Source1: http://llvm.org/releases/%{version}/%{clang_tools_srcdir}.tar.xz %endif Patch0: 0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch -Patch1: 0001-GCC-compatibility-Ignore-fstack-clash-protection.patch Patch2: 0001-Driver-Prefer-vendor-supplied-gcc-toolchain.patch Patch4: 0001-gtest-reorg.patch Patch5: 0001-Don-t-prefer-python2.7.patch @@ -212,7 +211,6 @@ pathfix.py -i %{__python3} -pn \ %setup -q -n %{clang_srcdir} %patch0 -p1 -b .lit-search-path -%patch1 -p1 -b .fstack-clash-protection %patch2 -p1 -b .vendor-gcc %patch4 -p1 -b .gtest %patch5 -p1 -b .no-python2 @@ -406,6 +404,9 @@ false %endif %changelog +* Fri Dec 14 2018 sguelton@redhat.com - 7.0.0-9 +- No longer Ignore -fstack-clash-protection option + * Tue Dec 04 2018 sguelton@redhat.com - 7.0.0-8 - Ensure rpmlint passes on specfile