mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-22 14:12:26 +00:00
c175b21ce4
Bring in the fixes for GCC 7 through 13. https://rtx.meta.security/mitigation/2023/09/12/CVE-2023-4039.html https://developer.arm.com/Arm%20Security%20Center/GCC%20Stack%20Protector%20Vulnerability%20AArch64 Signed-off-by: Chris Packham <judge.packham@gmail.com>
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 8b664cc8f05c8130e8ca73a59ae2751cdef8a0ea Mon Sep 17 00:00:00 2001
|
|
From: Richard Sandiford <richard.sandiford@arm.com>
|
|
Date: Tue, 12 Sep 2023 16:19:48 +0100
|
|
Subject: [PATCH 22/29] aarch64: Simplify top of frame allocation
|
|
|
|
After previous patches, it no longer really makes sense to allocate
|
|
the top of the frame in terms of varargs_and_saved_regs_size and
|
|
saved_regs_and_above.
|
|
|
|
gcc/
|
|
* config/aarch64/aarch64.c (aarch64_layout_frame): Simplify
|
|
the allocation of the top of the frame.
|
|
---
|
|
gcc/config/aarch64/aarch64.c | 23 ++++++++---------------
|
|
1 file changed, 8 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
|
index 45ff664cba6b..779547d03447 100644
|
|
--- a/gcc/config/aarch64/aarch64.c
|
|
+++ b/gcc/config/aarch64/aarch64.c
|
|
@@ -7584,23 +7584,16 @@ aarch64_layout_frame (void)
|
|
|
|
frame.saved_regs_size = offset - frame.bytes_below_saved_regs;
|
|
|
|
- poly_int64 varargs_and_saved_regs_size
|
|
- = frame.saved_regs_size + frame.saved_varargs_size;
|
|
+ offset += get_frame_size ();
|
|
+ offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT);
|
|
+ auto top_of_locals = offset;
|
|
|
|
- poly_int64 saved_regs_and_above
|
|
- = aligned_upper_bound (varargs_and_saved_regs_size
|
|
- + get_frame_size (),
|
|
- STACK_BOUNDARY / BITS_PER_UNIT);
|
|
+ offset += frame.saved_varargs_size;
|
|
+ gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT));
|
|
+ frame.frame_size = offset;
|
|
|
|
- frame.bytes_above_hard_fp
|
|
- = saved_regs_and_above - frame.below_hard_fp_saved_regs_size;
|
|
-
|
|
- /* Both these values are already aligned. */
|
|
- gcc_assert (multiple_p (frame.bytes_below_saved_regs,
|
|
- STACK_BOUNDARY / BITS_PER_UNIT));
|
|
- frame.frame_size = saved_regs_and_above + frame.bytes_below_saved_regs;
|
|
-
|
|
- frame.bytes_above_locals = frame.saved_varargs_size;
|
|
+ frame.bytes_above_hard_fp = frame.frame_size - frame.bytes_below_hard_fp;
|
|
+ frame.bytes_above_locals = frame.frame_size - top_of_locals;
|
|
|
|
frame.initial_adjust = 0;
|
|
frame.final_adjust = 0;
|
|
--
|
|
2.42.0
|
|
|