commit: 8fba578db32186d732be41b8b8a1cc31684e8e52 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Thu Jan 18 02:46:06 2018 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Thu Jan 18 02:46:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8fba578d
sys-devel/gcc: remove redundant patches ...ove-struct-ix86_frame-to-machine-function.patch | 53 ------------------ ...ove-struct-ix86_frame-to-machine-function.patch | 62 ---------------------- sys-devel/gcc/gcc-7.2.0-r2.ebuild | 2 - 3 files changed, 117 deletions(-) diff --git a/sys-devel/gcc/files/0003-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch b/sys-devel/gcc/files/0003-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch deleted file mode 100644 index 2f27301..0000000 --- a/sys-devel/gcc/files/0003-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: "H.J. Lu" <[email protected]> -To: [email protected] -Subject: [3/3] GCC 7: i386: More use reference of struct ix86_frame to avoid - copy -Date: Sun, 14 Jan 2018 07:02:37 -0800 - -When there is no need to make a copy of ix86_frame, we can use reference -of struct ix86_frame to avoid copy. - - Backport from mainline - * config/i386/i386.c (ix86_expand_prologue): Use reference of - struct ix86_frame. - (ix86_expand_epilogue): Likewise. ---- - gcc/config/i386/i386.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 397ef7cac26..986e6d79584 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -13667,7 +13667,6 @@ ix86_expand_prologue (void) - { - struct machine_function *m = cfun->machine; - rtx insn, t; -- struct ix86_frame frame; - HOST_WIDE_INT allocate; - bool int_registers_saved; - bool sse_registers_saved; -@@ -13691,7 +13690,7 @@ ix86_expand_prologue (void) - m->fs.sp_valid = true; - - ix86_compute_frame_layout (); -- frame = m->frame; -+ struct ix86_frame &frame = cfun->machine->frame; - - if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl)) - { -@@ -14354,13 +14353,12 @@ ix86_expand_epilogue (int style) - { - struct machine_function *m = cfun->machine; - struct machine_frame_state frame_state_save = m->fs; -- struct ix86_frame frame; - bool restore_regs_via_mov; - bool using_drap; - - ix86_finalize_stack_realign_flags (); - ix86_compute_frame_layout (); -- frame = m->frame; -+ struct ix86_frame &frame = cfun->machine->frame; - - m->fs.sp_valid = (!frame_pointer_needed - || (crtl->sp_is_unchanging diff --git a/sys-devel/gcc/files/0004-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch b/sys-devel/gcc/files/0004-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch deleted file mode 100644 index dc12402..0000000 --- a/sys-devel/gcc/files/0004-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c25b81ba01fa9ac0c1baa3aabd64190c47928f03 Mon Sep 17 00:00:00 2001 -From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 16 Jan 2018 12:49:29 +0000 -Subject: [PATCH 1/1] i386: Don't use reference of struct ix86_frame - -Use reference of struct ix86_frame in ix86_expand_prologue and -ix86_expand_epilogue caused: - -raised STORAGE_ERROR : stack overflow or erroneous memory access -make[5]: *** [/export/gnu/import/git/sources/gcc/gcc/ada/Make-generated.in:45: ada/sinfo.h] Error 1 - -on trunk when bootstrapping GCC with ada on x86-64. - - * config/i386/i386.c (ix86_expand_prologue): Don't use reference - of struct ix86_frame. - (ix86_expand_epilogue): Likewise. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256742 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/config/i386/i386.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index e758387..ba2abc5 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -14061,6 +14061,7 @@ ix86_expand_prologue (void) - { - struct machine_function *m = cfun->machine; - rtx insn, t; -+ struct ix86_frame frame; - HOST_WIDE_INT allocate; - bool int_registers_saved; - bool sse_registers_saved; -@@ -14084,7 +14085,7 @@ ix86_expand_prologue (void) - m->fs.sp_valid = true; - - ix86_compute_frame_layout (); -- struct ix86_frame &frame = cfun->machine->frame; -+ frame = m->frame; - - if (!TARGET_64BIT && ix86_function_ms_hook_prologue (current_function_decl)) - { -@@ -14747,12 +14748,13 @@ ix86_expand_epilogue (int style) - { - struct machine_function *m = cfun->machine; - struct machine_frame_state frame_state_save = m->fs; -+ struct ix86_frame frame; - bool restore_regs_via_mov; - bool using_drap; - - ix86_finalize_stack_realign_flags (); - ix86_compute_frame_layout (); -- struct ix86_frame &frame = cfun->machine->frame; -+ frame = m->frame; - - m->fs.sp_valid = (!frame_pointer_needed - || (crtl->sp_is_unchanging --- -2.9.3 - diff --git a/sys-devel/gcc/gcc-7.2.0-r2.ebuild b/sys-devel/gcc/gcc-7.2.0-r2.ebuild index 138a077..13efa44 100644 --- a/sys-devel/gcc/gcc-7.2.0-r2.ebuild +++ b/sys-devel/gcc/gcc-7.2.0-r2.ebuild @@ -27,8 +27,6 @@ src_prepare() { # Meltdown/Spectre epatch "${FILESDIR}"/0001-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch epatch "${FILESDIR}"/0002-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch - epatch "${FILESDIR}"/0003-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch - epatch "${FILESDIR}"/0004-gcc-7.2.0-move-struct-ix86_frame-to-machine-function.patch epatch "${FILESDIR}"/spectre-0001-mindirect-branch.patch epatch "${FILESDIR}"/spectre-0002-mfunction-return.patch
