From a8f7a89526b5fb1b17a6972b943fcbd8c4d0475a Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Tue, 19 Jul 2016 03:31:48 +0000 Subject: [PATCH] re PR target/71493 (accidental ABI change for structure return on PowerPC) [gcc] 2016-07-18 Michael Meissner PR target/71493 * config/rs6000/rs6000.c (rs6000_function_value): Fix unintentional System V.4 structure return breakage for structures with a single floating point element. [gcc/testsuite] 2016-07-18 Michael Meissner PR target/71493 * gcc.target/powerpc/pr71493-1.c: New test. * gcc.target/powerpc/pr71493-2.c: Likewise. From-SVN: r238454 --- gcc/ChangeLog | 7 +++++++ gcc/config/rs6000/rs6000.c | 3 ++- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.target/powerpc/pr71493-1.c | 13 +++++++++++++ gcc/testsuite/gcc.target/powerpc/pr71493-2.c | 13 +++++++++++++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/powerpc/pr71493-1.c create mode 100644 gcc/testsuite/gcc.target/powerpc/pr71493-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3f24fab978d..5d7c09912a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-07-18 Michael Meissner + + PR target/71493 + * config/rs6000/rs6000.c (rs6000_function_value): Fix + unintentional System V.4 structure return breakage for structures + with a single floating point element. + 2016-07-18 Yuri Rumyantsev PR tree-optimization/71734 diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 63655b1d267..6fe94d5084c 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -35467,7 +35467,8 @@ rs6000_function_value (const_tree valtype, if (DECIMAL_FLOAT_MODE_P (mode) && TARGET_HARD_FLOAT && TARGET_FPRS) /* _Decimal128 must use an even/odd register pair. */ regno = (mode == TDmode) ? FP_ARG_RETURN + 1 : FP_ARG_RETURN; - else if (SCALAR_FLOAT_MODE_NOT_VECTOR_P (mode) && TARGET_HARD_FLOAT && TARGET_FPRS + else if (SCALAR_FLOAT_TYPE_P (valtype) && TARGET_HARD_FLOAT && TARGET_FPRS + && !FLOAT128_VECTOR_P (mode) && ((TARGET_SINGLE_FLOAT && (mode == SFmode)) || TARGET_DOUBLE_FLOAT)) regno = FP_ARG_RETURN; else if (TREE_CODE (valtype) == COMPLEX_TYPE diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 86655a043d7..2dd59609bdd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-07-18 Michael Meissner + + PR target/71493 + * gcc.target/powerpc/pr71493-1.c: New test. + * gcc.target/powerpc/pr71493-2.c: Likewise. + 2016-07-18 Jakub Jelinek PR c++/71835 diff --git a/gcc/testsuite/gcc.target/powerpc/pr71493-1.c b/gcc/testsuite/gcc.target/powerpc/pr71493-1.c new file mode 100644 index 00000000000..9ec9da0fbed --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr71493-1.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { powerpc*-*-linux* && ilp32 } } } */ +/* { dg-options "-O2 -msvr4-struct-return" } */ + +struct S1 { float f; }; + +struct S1 foo1 (void) +{ + struct S1 s = { 1.0f }; + return s; +} + +/* { dg-final { scan-assembler "lwz" } } */ +/* { dg-final { scan-assembler-not "lfs" } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/pr71493-2.c b/gcc/testsuite/gcc.target/powerpc/pr71493-2.c new file mode 100644 index 00000000000..e9184a605be --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr71493-2.c @@ -0,0 +1,13 @@ +/* { dg-do compile { target { powerpc*-*-linux* && ilp32 } } } */ +/* { dg-options "-O2 -msvr4-struct-return" } */ + +struct S2 { double d; }; + +struct S2 foo2 (void) +{ + struct S2 s = { 1.0 }; + return s; +} + +/* { dg-final { scan-assembler "lwz" } } */ +/* { dg-final { scan-assembler-not "lfd" } } */ -- 2.30.2