FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: Properly disable -fsplit-stack support on non-glibc targets

Browse source 
Revert x86 changes in

commit c163647ffb
Author: Soren Tempel <soeren@soeren-tempel.net>
Date:   Fri Jan 21 19:22:46 2022 +0000

    Disable -fsplit-stack support on non-glibc targets

and change ix86_supports_split_stack to return true only on glibc.

	PR bootstrap/104170
	* common/config/i386/i386-common.cc (ix86_supports_split_stack):
	Return true only on glibc.
	* config/i386/gnu-user-common.h (STACK_CHECK_STATIC_BUILTIN):
	Revert commit c163647ffb.
	* config/i386/gnu.h (TARGET_LIBC_PROVIDES_SSP): Likewise.
This commit is contained in:
H.J. Lu 2022-01-21 13:24:00 -08:00
parent f36efe71be
commit 60953a23d5
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gcc/common/config/i386/i386-common.cc
View file

@ -1714,16 +1714,21 @@ ix86_option_init_struct (struct gcc_options *opts)
field in the TCB, so they cannot be used together. */
static bool
ix86_supports_split_stack (bool report ATTRIBUTE_UNUSED,
ix86_supports_split_stack (bool report,
struct gcc_options *opts ATTRIBUTE_UNUSED)
{
#ifdef TARGET_THREAD_SPLIT_STACK_OFFSET
if (opts->x_linux_libc != LIBC_GLIBC)
#endif
{
if (report)
error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
return false;
}
bool ret = true;
#ifndef TARGET_THREAD_SPLIT_STACK_OFFSET
if (report)
error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
ret = false;
#else
#ifdef TARGET_THREAD_SPLIT_STACK_OFFSET
if (!HAVE_GAS_CFI_PERSONALITY_DIRECTIVE)
{
if (report)

5
gcc/config/i386/gnu-user-common.h
View file

@ -66,8 +66,7 @@ along with GCC; see the file COPYING3. If not see
#define STACK_CHECK_STATIC_BUILTIN 1
/* We only build the -fsplit-stack support in libgcc if the
assembler has full support for the CFI directives and
targets glibc. */
#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && OPTION_GLIBC
assembler has full support for the CFI directives. */
#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
#define TARGET_CAN_SPLIT_STACK
#endif

5
gcc/config/i386/gnu.h
View file

@ -35,10 +35,7 @@ along with GCC. If not, see <http://www.gnu.org/licenses/>.
crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
#endif
/* -fsplit-stack uses a field in the TCB at a fixed offset. This
field is only available for glibc. Disable -fsplit-stack for
other libc implementations to avoid silent TCB corruptions. */
#if defined (TARGET_LIBC_PROVIDES_SSP) && OPTION_GLIBC
#ifdef TARGET_LIBC_PROVIDES_SSP
/* i386 glibc provides __stack_chk_guard in %gs:0x14. */
#define TARGET_THREAD_SSP_OFFSET 0x14