From: "Dragan Mladjenovic" <dmladjeno...@wavecomp.com> libgcc/ChangeLog:
2019-08-05 Dragan Mladjenovic <dmladjeno...@wavecomp.com> * config/mips/gnustack.h: Check for TARGET_LIBC_GNUSTACK also. gcc/ChangeLog: 2019-08-05 Dragan Mladjenovic <dmladjeno...@wavecomp.com> * config.in: Regenerated. * config/mips/linux.h (NEED_INDICATE_EXEC_STACK): Define to 1 for TARGET_LIBC_GNUSTACK. * configure: Regenerated. * configure.ac: Define TARGET_LIBC_GNUSTACK if glibc version is found 2.31 or greater. --- gcc/config/mips/linux.h | 4 ++++ gcc/configure.ac | 12 ++++++++++++ libgcc/config/mips/gnustack.h | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index 1fa72ef..30b22e7 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -53,4 +53,8 @@ along with GCC; see the file COPYING3. If not see #undef NEED_INDICATE_EXEC_STACK +#ifdef TARGET_LIBC_GNUSTACK +#define NEED_INDICATE_EXEC_STACK 1 +#else #define NEED_INDICATE_EXEC_STACK TARGET_SOFT_FLOAT +#endif diff --git a/gcc/configure.ac b/gcc/configure.ac index c620dd2..ab080c8 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -6143,6 +6143,18 @@ if test x$gcc_cv_libc_provides_hwcap_in_tcb = xyes; then [Define if your target C Library provides the AT_HWCAP value in the TCB]) fi +# Check if the target LIBC handles PT_GNU_STACK. +gcc_cv_libc_gnustack=unknown +case "$target" in + mips*-*-linux*) + GCC_GLIBC_VERSION_GTE_IFELSE([2], [31], [gcc_cv_libc_gnustack=yes], ) + ;; +esac +if test x$gcc_cv_libc_gnustack = xyes; then + AC_DEFINE(TARGET_LIBC_GNUSTACK, 1, + [Define if your target C Library properly handles PT_GNU_STACK]) +fi + AC_MSG_CHECKING(dl_iterate_phdr in target C library) gcc_cv_target_dl_iterate_phdr=unknown case "$target" in diff --git a/libgcc/config/mips/gnustack.h b/libgcc/config/mips/gnustack.h index 6d5f618..a67c4b2 100644 --- a/libgcc/config/mips/gnustack.h +++ b/libgcc/config/mips/gnustack.h @@ -1,6 +1,6 @@ #include "config.h" #if defined(__ELF__) && defined(__linux__) -#if defined (__mips_soft_float) +#if defined (TARGET_LIBC_GNUSTACK) || defined (__mips_soft_float) .section .note.GNU-stack,"",%progbits .previous #endif -- 1.9.1