OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IBM Z: Spectre: Prevent thunk cfi to be emitted with -fno-dwarf2-cfi-asm

Browse Source 
The CFI magic we emit as part of the indirect branch thunks in order to
have somewhat sane unwind information must not be emitted with
-fno-dwarf2-cfi-asm.

gcc/ChangeLog:

2018-04-12  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* config/s390/s390.c (s390_output_indirect_thunk_function): Check
	also for flag_dwarf2_cfi_asm.

gcc/testsuite/ChangeLog:

2018-04-12  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* gcc.target/s390/nobp-no-dwarf2-cfi.c: New test.

From-SVN: r259340
This commit is contained in:
Andreas Krebbel 2018-04-12 09:14:57 +00:00 committed by Andreas Krebbel
parent c72a0e67a2
commit b9dd1a7928
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2018-04-12 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* config/s390/s390.c (s390_output_indirect_thunk_function): Check
also for flag_dwarf2_cfi_asm.
2018-04-12 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/85342

2
gcc/config/s390/s390.c
View File

@ -16522,7 +16522,7 @@ s390_output_indirect_thunk_function (unsigned int regno, bool z10_p)
Stopping in the thunk: backtrace will point to the thunk target
is if it was interrupted by a signal. For a call this means that
the call chain will be: caller->callee->thunk */
if (flag_asynchronous_unwind_tables)
if (flag_asynchronous_unwind_tables && flag_dwarf2_cfi_asm)
{
fputs ("\t.cfi_signal_frame\n", asm_out_file);
fprintf (asm_out_file, "\t.cfi_return_column %d\n", regno);

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2018-04-12 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* gcc.target/s390/nobp-no-dwarf2-cfi.c: New test.
2018-04-12 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/85342

19
gcc/testsuite/gcc.target/s390/nobp-no-dwarf2-cfi.c Normal file
View File

@ -0,0 +1,19 @@
/* { dg-do run } */
/* { dg-options "-O3 -march=z900 --save-temps -mfunction-return-reg=thunk -mindirect-branch-table -fno-dwarf2-cfi-asm" } */
/* Make sure that we do not emit .cfi directives when -fno-dwarf2-cfi-asm is being used. */
int
main ()
{
return 0;
}
/* 1 x main
/* { dg-final { scan-assembler-times "jg\t__s390_indirect_jump" 1 } } */
/* { dg-final { scan-assembler "ex\t" } } */
/* { dg-final { scan-assembler-not "section\t.s390_indirect_jump" } } */
/* { dg-final { scan-assembler-not "section\t.s390_indirect_call" } } */
/* { dg-final { scan-assembler "section\t.s390_return_reg" } } */
/* { dg-final { scan-assembler-not "section\t.s390_return_mem" } } */