diff options
author | Caroline Tice <cmtice@google.com> | 2018-01-29 13:36:52 -0800 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2018-01-29 22:19:21 +0000 |
commit | d64d815b3af9d2653d924ea2e1ebb21ee8b043b7 (patch) | |
tree | 41ddc808254fa6b40de6540413015909760ec306 /gcc-4.9/gcc/config/i386/i386-opts.h | |
parent | 430f43829fa42b459ccbb53b44843c54c8ba4550 (diff) | |
download | toolchain_gcc-d64d815b3af9d2653d924ea2e1ebb21ee8b043b7.tar.gz toolchain_gcc-d64d815b3af9d2653d924ea2e1ebb21ee8b043b7.tar.bz2 toolchain_gcc-d64d815b3af9d2653d924ea2e1ebb21ee8b043b7.zip |
[GCC] Update with latest retpoline fixes from Intel.
Intel has updated their retpoline patches since we created our
original patch. This CL updates our retpoline changes to match
the latest from Intel.
Bug: None
Test: Tested extensively in ChromeOS. Built x86 platform & kernel
images in Android.
Change-Id: Id1a18cb1f1f4461832a017cb5c5d59e5400d9d08
Diffstat (limited to 'gcc-4.9/gcc/config/i386/i386-opts.h')
-rw-r--r-- | gcc-4.9/gcc/config/i386/i386-opts.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc-4.9/gcc/config/i386/i386-opts.h b/gcc-4.9/gcc/config/i386/i386-opts.h index e98cd8c1e..f44620781 100644 --- a/gcc-4.9/gcc/config/i386/i386-opts.h +++ b/gcc-4.9/gcc/config/i386/i386-opts.h @@ -93,6 +93,11 @@ enum stack_protector_guard { SSP_GLOBAL /* global canary */ }; +/* This is used to mitigate variant #2 of the speculative execution + vulnerabilities on x86 processors identified by CVE-2017-5715, aka + Spectre. They convert indirect branches and function returns to + call and return thunks to avoid speculative execution via indirect + call, jmp and ret. */ enum indirect_branch { indirect_branch_unset = 0, indirect_branch_keep, @@ -101,10 +106,4 @@ enum indirect_branch { indirect_branch_thunk_extern }; -enum indirect_branch_loop { - indirect_branch_loop_lfence, - indirect_branch_loop_pause, - indirect_branch_loop_nop -}; - #endif |