diff options
author | Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com> | 2022-04-07 15:26:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-09 19:50:45 +0100 |
commit | a8095c99ab30e96e620c2e0ef0aec8bc54753894 (patch) | |
tree | cb54d721269106c9f9badaee130c034eb3f96dfc /meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch | |
parent | 89efab2850766378d89579c094670357775b69b6 (diff) | |
download | poky-a8095c99ab30e96e620c2e0ef0aec8bc54753894.tar.gz |
gcc: upgrade 11.2 -> current 12 snapshotuninative-3.6master-uninative
gcc 12 is expected to be released this month or early next month.
Update so we're prepared.
This keeps/ports all patches currently applied to 11.2 that haven't
landed upstream yet.
[v2: Back out the zephyr DWARF-4 workaround]
(From OE-Core rev: 540116ca70fb71ac489b61b74b3a397ff92f27e2)
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch b/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch deleted file mode 100644 index e09818fecf..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0002-CVE-2021-35465.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 574e7950bd6b34e9e2cacce18c802b45505d1d0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Earnshaw <rearnsha@arm.com> | ||
3 | Date: Fri, 18 Jun 2021 17:16:25 +0100 | ||
4 | Subject: [PATCH] arm: add erratum mitigation to __gnu_cmse_nonsecure_call | ||
5 | [PR102035] | ||
6 | |||
7 | Add the recommended erratum mitigation sequence to | ||
8 | __gnu_cmse_nonsecure_call for use on Armv8-m.main devices. Since this | ||
9 | is in the library code we cannot know in advance whether the core we | ||
10 | are running on will be affected by this, so always enable it. | ||
11 | |||
12 | libgcc: | ||
13 | PR target/102035 | ||
14 | * config/arm/cmse_nonsecure_call.S (__gnu_cmse_nonsecure_call): | ||
15 | Add vlldm erratum work-around. | ||
16 | |||
17 | CVE: CVE-2021-35465 | ||
18 | Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=574e7950bd6b34e9e2cacce18c802b45505d1d0a] | ||
19 | Signed-off-by: Pgowda <pgowda.cve@gmail.com> | ||
20 | |||
21 | --- | ||
22 | libgcc/config/arm/cmse_nonsecure_call.S | 5 +++++ | ||
23 | 1 file changed, 5 insertions(+) | ||
24 | |||
25 | diff --git a/libgcc/config/arm/cmse_nonsecure_call.S b/libgcc/config/arm/cmse_nonsecure_call.S | ||
26 | --- a/libgcc/config/arm/cmse_nonsecure_call.S | ||
27 | +++ b/libgcc/config/arm/cmse_nonsecure_call.S | ||
28 | @@ -102,6 +102,11 @@ blxns r4 | ||
29 | #ifdef __ARM_PCS_VFP | ||
30 | vpop.f64 {d8-d15} | ||
31 | #else | ||
32 | +/* VLLDM erratum mitigation sequence. */ | ||
33 | +mrs r5, control | ||
34 | +tst r5, #8 /* CONTROL_S.SFPA */ | ||
35 | +it ne | ||
36 | +.inst.w 0xeeb00a40 /* vmovne s0, s0 */ | ||
37 | vlldm sp /* Lazy restore of d0-d16 and FPSCR. */ | ||
38 | add sp, sp, #0x88 /* Free space used to save floating point registers. */ | ||
39 | #endif /* __ARM_PCS_VFP */ | ||