Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
sergesanspaille | d06b607b7c | |
sergesanspaille | a0adc1d340 | |
Tom Stellard | a486c1bf42 | |
Tom Stellard | 1f77776fe5 |
|
@ -1,42 +0,0 @@
|
|||
From 428ca4520a79ec5a6df9c6adc8b8069623868cdb Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
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<clang_ignored_gcc_optimization_f_Group>;
|
||||
defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_f_Group>;
|
||||
defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
|
||||
+defm stack_clash_protection : BooleanFFlag<"stack-clash-protection">, Group<clang_ignored_f_Group>;
|
||||
defm strength_reduce :
|
||||
BooleanFFlag<"strength-reduce">, Group<clang_ignored_gcc_optimization_f_Group>;
|
||||
defm tls_model : BooleanFFlag<"tls-model">, Group<clang_ignored_f_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
|
||||
|
15
clang.spec
15
clang.spec
|
@ -38,7 +38,7 @@
|
|||
|
||||
Name: clang
|
||||
Version: %{maj_ver}.%{min_ver}.%{patch_ver}
|
||||
Release: 1%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: A C language family front-end for LLVM
|
||||
|
||||
License: NCSA
|
||||
|
@ -50,7 +50,6 @@ Source2: http://llvm.org/releases/%{version}/%{test_suite_srcdir}.tar.xz
|
|||
Source100: clang-config.h
|
||||
|
||||
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
|
||||
|
||||
BuildRequires: cmake
|
||||
|
@ -172,7 +171,6 @@ Requires: python2
|
|||
|
||||
%setup -q -n %{clang_srcdir}
|
||||
%patch0 -p1 -b .lit-search-path
|
||||
%patch1 -p1 -b .fstack-clash-protection
|
||||
%patch2 -p1 -b .vendor-gcc
|
||||
|
||||
mv ../%{clang_tools_srcdir} tools/extra
|
||||
|
@ -280,7 +278,6 @@ make %{?_smp_mflags} check || :
|
|||
|
||||
|
||||
%files
|
||||
%{_libdir}/clang/
|
||||
%{clang_binaries}
|
||||
%{_bindir}/c-index-test
|
||||
%{_mandir}/man1/clang.1.gz
|
||||
|
@ -289,6 +286,7 @@ make %{?_smp_mflags} check || :
|
|||
%{_datadir}/clang/clang-format-diff.py*
|
||||
|
||||
%files libs
|
||||
%{_libdir}/clang/
|
||||
%{_libdir}/*.so.*
|
||||
%{_libdir}/*.so
|
||||
|
||||
|
@ -327,6 +325,15 @@ make %{?_smp_mflags} check || :
|
|||
%{python2_sitelib}/clang/
|
||||
|
||||
%changelog
|
||||
* Tue Apr 2 2019 sguelton@redhat.com - 6.0.1-4
|
||||
- Rebuild
|
||||
|
||||
* Fri Jan 11 2019 sguelton@redhat.com - 6.0.1-3
|
||||
- No longer ignore -fstack-clash-protect
|
||||
|
||||
* Wed Sep 19 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-2
|
||||
- Move builtin headers into clang-libs sub-package
|
||||
|
||||
* Tue Jun 26 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
|
||||
- 6.0.1 Release
|
||||
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
# This is separate from tests.yml because we want to run the tests without
|
||||
# clang installed.
|
||||
# FIXME: Is there some way we can put this yaml definition in the tests/pocl
|
||||
# repo? Right now we need to copy and paste this everywhere the test is run.
|
||||
- hosts: localhost
|
||||
pre_tasks:
|
||||
# Programs linked against pocl should be able to run without clang installed,
|
||||
# so when we run the test we want to make sure clang is not installed to
|
||||
# verify we haven't introduced an implicit dependency on clang.
|
||||
- name: Uninstall clang
|
||||
package:
|
||||
name: clang
|
||||
state: absent
|
||||
tags: classic
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
repositories:
|
||||
- repo: "https://src.fedoraproject.org/tests/pocl.git"
|
||||
dest: "pocl"
|
||||
required_packages:
|
||||
- ocl-icd-devel
|
||||
- pocl
|
||||
- gcc
|
||||
tests:
|
||||
# rhbz#1582884
|
||||
- simple-opencl-no-clang:
|
||||
dir: pocl/simple-opencl-no-clang
|
||||
run: ./runtest.sh
|
||||
|
||||
|
Loading…
Reference in New Issue