aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2018-07-27 14:40:47 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2018-07-27 07:40:47 -0700
commitb72e71a39c33fac823b8f65f43aa15a8bb0ae676 (patch)
tree4ed990f1e47d2033ac266546efb14492e60ea250 /libgcc
parent3d592d2d56ccd3298ea0121de16615d27b9fb659 (diff)
downloadgcc-b72e71a39c33fac823b8f65f43aa15a8bb0ae676.zip
gcc-b72e71a39c33fac823b8f65f43aa15a8bb0ae676.tar.gz
gcc-b72e71a39c33fac823b8f65f43aa15a8bb0ae676.tar.bz2
i386: Remove _Unwind_Frames_Increment
CET kernel has been changed to place a restore token on shadow stack for signal handler to enhance security. It is usually transparent to user programs since kernel will pop the restore token when signal handler returns. But when an exception is thrown from a signal handler, now we need to remove _Unwind_Frames_Increment to pop the the restore token from shadow stack. Otherwise, we get FAIL: g++.dg/torture/pr85334.C -O0 execution test FAIL: g++.dg/torture/pr85334.C -O1 execution test FAIL: g++.dg/torture/pr85334.C -O2 execution test FAIL: g++.dg/torture/pr85334.C -O3 -g execution test FAIL: g++.dg/torture/pr85334.C -Os execution test FAIL: g++.dg/torture/pr85334.C -O2 -flto -fno-use-linker-plugin -flto-partition=none execution test PR libgcc/85334 * config/i386/shadow-stack-unwind.h (_Unwind_Frames_Increment): Removed. From-SVN: r263030
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/config/i386/shadow-stack-unwind.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index c13bf4c..e0db8d1 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-27 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR libgcc/85334
+ * config/i386/shadow-stack-unwind.h (_Unwind_Frames_Increment):
+ Removed.
+
2018-07-05 James Clarke <jrtc27@jrtc27.com>
* configure: Regenerated.
diff --git a/libgcc/config/i386/shadow-stack-unwind.h b/libgcc/config/i386/shadow-stack-unwind.h
index a32f3e7..40f48df 100644
--- a/libgcc/config/i386/shadow-stack-unwind.h
+++ b/libgcc/config/i386/shadow-stack-unwind.h
@@ -49,8 +49,3 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
} \
} \
while (0)
-
-/* Increment frame count. Skip signal frames. */
-#undef _Unwind_Frames_Increment
-#define _Unwind_Frames_Increment(context, frames) \
- if (!_Unwind_IsSignalFrame (context)) frames++