From b41f0b3440bc8fe4982404c16a63b41521929450 Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Thu, 13 Jan 2011 15:59:19 +0000 Subject: [PATCH] Fix 47251, failure in powerpc -mcpu=power7 -m32 -msoft-float From-SVN: r168752 --- gcc/ChangeLog | 7 +++++++ gcc/config/rs6000/rs6000.md | 6 +++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/powerpc/pr47251.c | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/powerpc/pr47251.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1a3d1221813..b96f8121b32 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-01-13 Michael Meissner + + PR target/47251 + * config/rs6000/rs6000.md (floatunsdidf2): Add check for hardware + floating point. + (floatunsdidf2_fcfidu): Ditto. + 2011-01-13 Andreas Krebbel * config/s390/s390.c (print_operand_address): Replace 'error' with diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index 2d73bd83aed..6d2f515fcf8 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -7167,13 +7167,13 @@ [(set (match_operand:DF 0 "gpc_reg_operand" "") (unsigned_float:DF (match_operand:DI 1 "gpc_reg_operand" "")))] - "TARGET_FCFIDU || VECTOR_UNIT_VSX_P (DFmode)" + "TARGET_HARD_FLOAT && (TARGET_FCFIDU || VECTOR_UNIT_VSX_P (DFmode))" "") (define_insn "*floatunsdidf2_fcfidu" [(set (match_operand:DF 0 "gpc_reg_operand" "=d") (unsigned_float:DF (match_operand:DI 1 "gpc_reg_operand" "d")))] - "TARGET_FCFIDU && !VECTOR_UNIT_VSX_P (DFmode)" + "TARGET_HARD_FLOAT && TARGET_FCFIDU && !VECTOR_UNIT_VSX_P (DFmode)" "fcfidu %0,%1" [(set_attr "type" "fp") (set_attr "length" "4")]) @@ -7182,7 +7182,7 @@ [(set (match_operand:DF 0 "gpc_reg_operand" "=d") (unsigned_float:DF (match_operand:DI 1 "memory_operand" "m"))) (clobber (match_scratch:DI 2 "=d"))] - "TARGET_FCFIDU || VECTOR_UNIT_VSX_P (DFmode)" + "TARGET_HARD_FLOAT && (TARGET_FCFIDU || VECTOR_UNIT_VSX_P (DFmode))" "#" "&& reload_completed" [(set (match_dup 2) (match_dup 1)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3245e06bb75..c171c3d0028 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-01-13 Michael Meissner + + PR target/47251 + * gcc.target/powerpc/pr47251.c: New file, test PR 47251 fix. + 2011-01-13 Andreas Krebbel * gcc.dg/guality/pr36728-1.c: Disable arg1/2 checks for s390 and diff --git a/gcc/testsuite/gcc.target/powerpc/pr47251.c b/gcc/testsuite/gcc.target/powerpc/pr47251.c new file mode 100644 index 00000000000..3089c493378 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr47251.c @@ -0,0 +1,15 @@ +/* { dg-do compile { target { powerpc*-*-* && ip32 } } } */ +/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ +/* { dg-require-effective-target powerpc_vsx_ok } */ +/* { dg-options "-O2 -msoft-float -mcpu=power7" } */ + +/* PR 47151: libgcc fails to build when using --with-cpu=power7 due to a missed + TARGET_HARD_FLOAT test. */ +unsigned int +__fixunssfdi (float a) +{ + const float dfa = a; + const unsigned int hi = dfa / 0x1p32f; + const unsigned int lo = dfa - (float) hi * 0x1p32f; + return ((unsigned int) hi << (4 * 8)) | lo; +}