From b4f3e399064f9fcb355841156886c782676594f8 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 9 Mar 2021 13:08:47 +0000 Subject: [PATCH 1/2] THP ELF assembly: Add .note.GNU-stack section This indicates to GNU binutils that it can unset the executable stack flag on the binary that it is building. Refs: https://github.com/nodejs/node/issues/17933 --- src/large_pages/node_text_start.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S index 1609b254f0495a..6f56fae01c1903 100644 --- a/src/large_pages/node_text_start.S +++ b/src/large_pages/node_text_start.S @@ -2,4 +2,7 @@ .align 0x2000 .global __node_text_start .hidden __node_text_start +#if defined(__ELF__) +.section .note.GNU-stack,"",@progbits +#endif __node_text_start: From bd478f36f514d2cad016e78d9bed6f8d125bfb6f Mon Sep 17 00:00:00 2001 From: James Addison Date: Wed, 10 Mar 2021 11:30:22 +0000 Subject: [PATCH 2/2] Move .note.GNU-stack section to beginning of assembly file --- src/large_pages/node_text_start.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S index 6f56fae01c1903..3227b62464932c 100644 --- a/src/large_pages/node_text_start.S +++ b/src/large_pages/node_text_start.S @@ -1,8 +1,8 @@ +#if defined(__ELF__) +.section .note.GNU-stack,"",@progbits +#endif .text .align 0x2000 .global __node_text_start .hidden __node_text_start -#if defined(__ELF__) -.section .note.GNU-stack,"",@progbits -#endif __node_text_start: