From 95df04335bea92a715501271ad7d854e854706b3 Mon Sep 17 00:00:00 2001 From: Igor Tsimbalist Date: Fri, 16 Feb 2018 11:19:14 +0100 Subject: [PATCH] Additional fix for PR 84239. PR target/84239 * libgcc/config/i386/shadow-stack-unwind.h (_Unwind_Frames_Extra): Include cetintrin.h not x86intrin.h. From-SVN: r257730 --- libgcc/ChangeLog | 8 +++++++- libgcc/config/i386/shadow-stack-unwind.h | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 692773d7d2d..012c866f1c9 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,7 +1,13 @@ +2018-02-16 Igor Tsimbalist + + PR target/84239 + * config/i386/shadow-stack-unwind.h (_Unwind_Frames_Extra): + Include cetintrin.h not x86intrin.h. + 2018-02-08 Igor Tsimbalist PR target/84239 - * config/i386/shadow-stack-unwind.hi (_Unwind_Frames_Extra): + * config/i386/shadow-stack-unwind.h (_Unwind_Frames_Extra): Use new _get_ssp and _inc_ssp intrinsics. 2018-02-02 Julia Koval diff --git a/libgcc/config/i386/shadow-stack-unwind.h b/libgcc/config/i386/shadow-stack-unwind.h index 416e061dd46..b7c3d98a9dc 100644 --- a/libgcc/config/i386/shadow-stack-unwind.h +++ b/libgcc/config/i386/shadow-stack-unwind.h @@ -22,7 +22,14 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ -#include +/* NB: We need _get_ssp and _inc_ssp from . But we can't + include which ends up including , which + includes and unconditionally. But we can't + include any libc system headers unconditionally from libgcc. Avoid + including here by defining _IMMINTRIN_H_INCLUDED. */ +#define _IMMINTRIN_H_INCLUDED +#include +#undef _IMMINTRIN_H_INCLUDED /* Unwind the shadow stack for EH. */ #undef _Unwind_Frames_Extra