From ab4f3fafaa839593b3efd9ea12c8ee5d9340cdeb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Sep 2023 09:33:33 +0200 Subject: [PATCH] package/gcc: fix missing .note.GNU-stack section Shellinabox configure fails to detect ptsname_r, because of the following warning binutils 2.39+ emits: ld: warning: crtend.o: missing .note.GNU-stack section implies executable stack ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker Then the build errors out with: shellinabox/launcher.c:772:12: error: static declaration of 'ptsname_r' follows non-static declaration The same issue exist for cairo 1.16.0 and the detection of pthreads. Fixes: - http://autobuild.buildroot.net/results/3e4/3e478d22e820703ddfd11d1491e631ef8ed6b29b - http://autobuild.buildroot.net/results/f60/f602ea17d5938a5beb81d07e13de75ba41d5f6a1 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...add-.note.GNU-stack-section-on-linux.patch | 105 ++++++++++++++++++ ...add-.note.GNU-stack-section-on-linux.patch | 105 ++++++++++++++++++ 2 files changed, 210 insertions(+) create mode 100644 package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch create mode 100644 package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch diff --git a/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch new file mode 100644 index 0000000000..967bbaf3fe --- /dev/null +++ b/package/gcc/11.4.0/0007-xtensa-add-.note.GNU-stack-section-on-linux.patch @@ -0,0 +1,105 @@ +From 4958020ecc85a30c52544deaf3c017cea82a0fb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 2 Mar 2023 09:45:41 -0800 +Subject: [PATCH] xtensa: add .note.GNU-stack section on linux + +gcc/ + * config/xtensa/linux.h (TARGET_ASM_FILE_END): New macro. + +libgcc/ + * config/xtensa/crti.S: Add .note.GNU-stack section on linux. + * config/xtensa/crtn.S: Likewise. + * config/xtensa/lib1funcs.S: Likewise. + * config/xtensa/lib2funcs.S: Likewise. + +Signed-off-by: Max Filippov +Signed-off-by: Waldemar Brodkorb +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6360bf9a2d08f08c151464c77c0da53cd702ff25 +--- + gcc/config/xtensa/linux.h | 1 + + libgcc/config/xtensa/crti.S | 6 ++++++ + libgcc/config/xtensa/crtn.S | 6 ++++++ + libgcc/config/xtensa/lib1funcs.S | 6 ++++++ + libgcc/config/xtensa/lib2funcs.S | 6 ++++++ + 5 files changed, 25 insertions(+) + +diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h +index 468a48489e7..a69e38c58ee 100644 +--- a/gcc/config/xtensa/linux.h ++++ b/gcc/config/xtensa/linux.h +@@ -69,3 +69,4 @@ along with GCC; see the file COPYING3. If not see + + #undef DBX_REGISTER_NUMBER + ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack +diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S +index 87a66e32e4a..40dd8c0dbc2 100644 +--- a/libgcc/config/xtensa/crti.S ++++ b/libgcc/config/xtensa/crti.S +@@ -26,6 +26,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + .globl _init + .type _init,@function +diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S +index 8d2c2b1f22b..9d29f8fce1a 100644 +--- a/libgcc/config/xtensa/crtn.S ++++ b/libgcc/config/xtensa/crtn.S +@@ -27,6 +27,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ + retw +diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S +index a482a6eefc8..5245d7ad8ad 100644 +--- a/libgcc/config/xtensa/lib1funcs.S ++++ b/libgcc/config/xtensa/lib1funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* Define macros for the ABS and ADDX* instructions to handle cases + where they are not included in the Xtensa processor configuration. */ + +diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S +index 36938c84924..a574a45fa68 100644 +--- a/libgcc/config/xtensa/lib2funcs.S ++++ b/libgcc/config/xtensa/lib2funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* __xtensa_libgcc_window_spill: This function flushes out all but the + current register window. This is used to set up the stack so that + arbitrary frames can be accessed. */ +-- +2.39.2 + diff --git a/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch b/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch new file mode 100644 index 0000000000..4c79c3448f --- /dev/null +++ b/package/gcc/12.3.0/0003-xtensa-add-.note.GNU-stack-section-on-linux.patch @@ -0,0 +1,105 @@ +From 38cdfcc4b2cca8d251ff8d8d34201dfe9849333e Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Thu, 2 Mar 2023 09:45:41 -0800 +Subject: [PATCH] xtensa: add .note.GNU-stack section on linux + +gcc/ + * config/xtensa/linux.h (TARGET_ASM_FILE_END): New macro. + +libgcc/ + * config/xtensa/crti.S: Add .note.GNU-stack section on linux. + * config/xtensa/crtn.S: Likewise. + * config/xtensa/lib1funcs.S: Likewise. + * config/xtensa/lib2funcs.S: Likewise. + +Signed-off-by: Max Filippov +Signed-off-by: Waldemar Brodkorb +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6360bf9a2d08f08c151464c77c0da53cd702ff25 +--- + gcc/config/xtensa/linux.h | 1 + + libgcc/config/xtensa/crti.S | 6 ++++++ + libgcc/config/xtensa/crtn.S | 6 ++++++ + libgcc/config/xtensa/lib1funcs.S | 6 ++++++ + libgcc/config/xtensa/lib2funcs.S | 6 ++++++ + 5 files changed, 25 insertions(+) + +diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h +index edce618fb94..fe0e3a43797 100644 +--- a/gcc/config/xtensa/linux.h ++++ b/gcc/config/xtensa/linux.h +@@ -69,3 +69,4 @@ along with GCC; see the file COPYING3. If not see + + #undef DBX_REGISTER_NUMBER + ++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack +diff --git a/libgcc/config/xtensa/crti.S b/libgcc/config/xtensa/crti.S +index 3de7bc101f4..0996e7cb29b 100644 +--- a/libgcc/config/xtensa/crti.S ++++ b/libgcc/config/xtensa/crti.S +@@ -26,6 +26,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + .globl _init + .type _init,@function +diff --git a/libgcc/config/xtensa/crtn.S b/libgcc/config/xtensa/crtn.S +index 06b932edb14..a4cc9830096 100644 +--- a/libgcc/config/xtensa/crtn.S ++++ b/libgcc/config/xtensa/crtn.S +@@ -27,6 +27,12 @@ + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + .section .init + #if XCHAL_HAVE_WINDOWED && !__XTENSA_CALL0_ABI__ + retw +diff --git a/libgcc/config/xtensa/lib1funcs.S b/libgcc/config/xtensa/lib1funcs.S +index 5a2bd20534f..7177dd4f73a 100644 +--- a/libgcc/config/xtensa/lib1funcs.S ++++ b/libgcc/config/xtensa/lib1funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* Define macros for the ABS and ADDX* instructions to handle cases + where they are not included in the Xtensa processor configuration. */ + +diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S +index 681bac1be8c..a40c1a45604 100644 +--- a/libgcc/config/xtensa/lib2funcs.S ++++ b/libgcc/config/xtensa/lib2funcs.S +@@ -25,6 +25,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #include "xtensa-config.h" + ++/* An executable stack is *not* required for these functions. */ ++#if defined(__ELF__) && defined(__linux__) ++.section .note.GNU-stack,"",%progbits ++.previous ++#endif ++ + /* __xtensa_libgcc_window_spill: This function flushes out all but the + current register window. This is used to set up the stack so that + arbitrary frames can be accessed. */ +-- +2.39.2 +