From: Sasha Levin Date: Fri, 23 May 2025 12:19:04 +0000 (-0400) Subject: Drop x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch X-Git-Tag: v6.12.31~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=624e8d80ec6f2ba6be6087afda6b5107d945da6b;p=thirdparty%2Fkernel%2Fstable-queue.git Drop x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.12/series b/queue-6.12/series index 8afd6c9a87..8924f6e239 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -355,7 +355,6 @@ eth-mlx4-don-t-try-to-complete-xdp-frames-in-netpoll.patch pci-fix-old_size-lower-bound-in-calculate_iosize-too.patch acpi-hed-always-initialize-before-evged.patch vxlan-join-leave-mc-group-after-remote-changes.patch -x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch x86-boot-disable-stack-protector-for-early-boot-code.patch hrtimers-replace-hrtimer_clock_to_base_table-with-sw.patch irqchip-riscv-imsic-set-irq_set_affinity-for-imsic-b.patch diff --git a/queue-6.12/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch b/queue-6.12/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch deleted file mode 100644 index 63cb567c05..0000000000 --- a/queue-6.12/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e2c328b432149ff61d399af825c934869c86116e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Jan 2025 14:07:37 -0500 -Subject: x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations - -From: Brian Gerst - -[ Upstream commit cb7927fda002ca49ae62e2782c1692acc7b80c67 ] - -Clang may produce R_X86_64_REX_GOTPCRELX relocations when redefining the -stack protector location. Treat them as another type of PC-relative -relocation. - -Signed-off-by: Brian Gerst -Signed-off-by: Ingo Molnar -Reviewed-by: Ard Biesheuvel -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250123190747.745588-6-brgerst@gmail.com -Signed-off-by: Sasha Levin ---- - arch/x86/tools/relocs.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c -index c101bed619400..7f390e3374a76 100644 ---- a/arch/x86/tools/relocs.c -+++ b/arch/x86/tools/relocs.c -@@ -32,6 +32,11 @@ static struct relocs relocs32; - static struct relocs relocs32neg; - static struct relocs relocs64; - # define FMT PRIu64 -+ -+#ifndef R_X86_64_REX_GOTPCRELX -+# define R_X86_64_REX_GOTPCRELX 42 -+#endif -+ - #else - # define FMT PRIu32 - #endif -@@ -227,6 +232,7 @@ static const char *rel_type(unsigned type) - REL_TYPE(R_X86_64_PC16), - REL_TYPE(R_X86_64_8), - REL_TYPE(R_X86_64_PC8), -+ REL_TYPE(R_X86_64_REX_GOTPCRELX), - #else - REL_TYPE(R_386_NONE), - REL_TYPE(R_386_32), -@@ -861,6 +867,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, - - case R_X86_64_PC32: - case R_X86_64_PLT32: -+ case R_X86_64_REX_GOTPCRELX: - /* - * PC relative relocations don't need to be adjusted unless - * referencing a percpu symbol. --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index 3266a50f60..ccb8e0d13b 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -436,7 +436,6 @@ eth-mlx4-don-t-try-to-complete-xdp-frames-in-netpoll.patch pci-fix-old_size-lower-bound-in-calculate_iosize-too.patch acpi-hed-always-initialize-before-evged.patch vxlan-join-leave-mc-group-after-remote-changes.patch -x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch x86-boot-disable-stack-protector-for-early-boot-code.patch posix-timers-invoke-cond_resched-during-exit_itimers.patch hrtimers-replace-hrtimer_clock_to_base_table-with-sw.patch diff --git a/queue-6.14/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch b/queue-6.14/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch deleted file mode 100644 index 6c95c5445a..0000000000 --- a/queue-6.14/x86-relocs-handle-r_x86_64_rex_gotpcrelx-relocations.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d8e603969259e50aa632d1a3fde8883f41e26150 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Jan 2025 14:07:37 -0500 -Subject: x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations - -From: Brian Gerst - -[ Upstream commit cb7927fda002ca49ae62e2782c1692acc7b80c67 ] - -Clang may produce R_X86_64_REX_GOTPCRELX relocations when redefining the -stack protector location. Treat them as another type of PC-relative -relocation. - -Signed-off-by: Brian Gerst -Signed-off-by: Ingo Molnar -Reviewed-by: Ard Biesheuvel -Cc: Linus Torvalds -Link: https://lore.kernel.org/r/20250123190747.745588-6-brgerst@gmail.com -Signed-off-by: Sasha Levin ---- - arch/x86/tools/relocs.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c -index e937be979ec86..92a1e503305ef 100644 ---- a/arch/x86/tools/relocs.c -+++ b/arch/x86/tools/relocs.c -@@ -32,6 +32,11 @@ static struct relocs relocs32; - static struct relocs relocs32neg; - static struct relocs relocs64; - # define FMT PRIu64 -+ -+#ifndef R_X86_64_REX_GOTPCRELX -+# define R_X86_64_REX_GOTPCRELX 42 -+#endif -+ - #else - # define FMT PRIu32 - #endif -@@ -227,6 +232,7 @@ static const char *rel_type(unsigned type) - REL_TYPE(R_X86_64_PC16), - REL_TYPE(R_X86_64_8), - REL_TYPE(R_X86_64_PC8), -+ REL_TYPE(R_X86_64_REX_GOTPCRELX), - #else - REL_TYPE(R_386_NONE), - REL_TYPE(R_386_32), -@@ -861,6 +867,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym, - - case R_X86_64_PC32: - case R_X86_64_PLT32: -+ case R_X86_64_REX_GOTPCRELX: - /* - * PC relative relocations don't need to be adjusted unless - * referencing a percpu symbol. --- -2.39.5 -