rpms/gcc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring the branch on par with master.

Browse Source
This commit is contained in:
Marek Polacek 2017-11-30 20:07:35 +01:00
parent 86983dda69
commit 5687bc9b1d
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc.spec
View File

@ -11,6 +11,10 @@
%global _performance_build 1 %global _performance_build 1
# Hardening slows the compiler way too much. # Hardening slows the compiler way too much.
%undefine _hardened_build %undefine _hardened_build
%if 0%{?fedora} > 27
# Until annobin is fixed (#1519165).
%undefine _annotated_build
%endif
%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
%ifarch %{ix86} x86_64 ia64 ppc %{power64} alpha s390x %{arm} aarch64 %ifarch %{ix86} x86_64 ia64 ppc %{power64} alpha s390x %{arm} aarch64
%global build_ada 1 %global build_ada 1
@ -237,6 +241,7 @@ Patch13: gcc7-pr81325.patch
Patch14: gcc7-pr82112-1.patch Patch14: gcc7-pr82112-1.patch
Patch15: gcc7-pr82112-2.patch Patch15: gcc7-pr82112-2.patch
Patch16: gcc7-pr81929.patch Patch16: gcc7-pr81929.patch
Patch17: gcc7-aarch64-sanitizer-fix.patch
Patch1000: nvptx-tools-no-ptxas.patch Patch1000: nvptx-tools-no-ptxas.patch
Patch1001: nvptx-tools-build.patch Patch1001: nvptx-tools-build.patch
@ -849,6 +854,9 @@ package or when debugging this package.
%patch14 -p0 -b .pr82112-1~ %patch14 -p0 -b .pr82112-1~
%patch15 -p0 -b .pr82112-2~ %patch15 -p0 -b .pr82112-2~
%patch16 -p0 -b .pr81929~ %patch16 -p0 -b .pr81929~
%if 0%{?fedora} > 27
%patch17 -p0 -b .aarch64-sanitizer-fix~
%endif
cd nvptx-tools-%{nvptx_tools_gitrev} cd nvptx-tools-%{nvptx_tools_gitrev}
%patch1000 -p1 -b .nvptx-tools-no-ptxas~ %patch1000 -p1 -b .nvptx-tools-no-ptxas~

11
gcc7-aarch64-sanitizer-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- libsanitizer/sanitizer_common/sanitizer_linux.cc
+++ libsanitizer/sanitizer_common/sanitizer_linux.cc
@@ -1262,7 +1262,7 @@ struct __sanitizer_esr_context {
static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) {
static const u32 kEsrMagic = 0x45535201;
- u8 *aux = ucontext->uc_mcontext.__reserved;
+ u8 *aux = ucontext->uc_mcontext.__glibc_reserved1;
while (true) {
_aarch64_ctx *ctx = (_aarch64_ctx *)aux;
if (ctx->size == 0) break;