S/390: Fix cfi for GPR 2 FPR saves

gcc/ChangeLog:

2016-01-21  Andreas Krebbel  <[email protected]>

	    Backported from mainline
	    2015-07-24  Andreas Krebbel  <[email protected]>

	    * config/s390/s390.c (s390_save_gprs_to_fprs): Add CFA_REGISTER
	    reg note to the GPR -> FPR save instructions.

gcc/testsuite/ChangeLog:

2016-01-21  Andreas Krebbel  <[email protected]>

	    Backported from mainline
	    2015-07-24  Andreas Krebbel  <[email protected]>

	    * gcc.target/s390/gpr2fprsavecfi.c: New test.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@232665 138bc75d-0d04-0410-961f-82ee72b054a4

Author: krebbel

gcc/ChangeLog

@@ -1,3 +1,11 @@
+2016-01-21  Andreas Krebbel  <[email protected]>
+
+	Backported from mainline
+	2015-07-24  Andreas Krebbel  <[email protected]>
+
+	* config/s390/s390.c (s390_save_gprs_to_fprs): Add CFA_REGISTER
+	reg note to the GPR -> FPR save instructions.
+
 2016-01-21  Thomas Preud'homme  <[email protected]>
 
 	Backport from mainline

gcc/config/s390/s390.c

@@ -10149,6 +10149,10 @@ s390_save_gprs_to_fprs (void)
 	    emit_move_insn (gen_rtx_REG (DImode, cfun_gpr_save_slot (i)),
 			    gen_rtx_REG (DImode, i));
 	  RTX_FRAME_RELATED_P (insn) = 1;
+	  /* This prevents dwarf2cfi from interpreting the set.  Doing
+	     so it might emit def_cfa_register infos setting an FPR as
+	     new CFA.  */
+	  add_reg_note (insn, REG_CFA_REGISTER, PATTERN (insn));
 	}
     }
 }

gcc/testsuite/ChangeLog

@@ -1,3 +1,10 @@
+2016-01-21  Andreas Krebbel  <[email protected]>
+
+	Backported from mainline
+	2015-07-24  Andreas Krebbel  <[email protected]>
+
+	* gcc.target/s390/gpr2fprsavecfi.c: New test.
+
 2016-01-21  Thomas Preud'homme  <[email protected]>
 
 	Backport from mainline

gcc/testsuite/gcc.target/s390/gpr2fprsavecfi.c

@@ -0,0 +1,23 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -march=z10 -mzarch -fdwarf2-cfi-asm" } */
+
+char *gl[100];
+
+long
+foo ()
+{
+  long r = 0;
+  char bla[100];
+  int i;
+
+  __builtin_memcpy (bla, gl, 100);
+
+  for (i = 0; i < 100; i++)
+    r += bla[i];
+
+  return r;
+}
+
+/* { dg-final { scan-assembler-not "cfi_def_cfa_register" } } */
+/* { dg-final { scan-assembler "cfi_register" } } */
+/* { dg-final { scan-assembler "cfi_def_cfa_offset" } } */