From 285346b5eba02c9a21351355de4cb7fb7d2b91ef Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Thu, 16 Nov 2017 18:35:42 +0000 Subject: [PATCH] rs6000.c (rs6000_expand_builtin): Do not do the switch statement mapping KF built-ins to TF built-ins if... [gcc] 2017-11-15 Michael Meissner * config/rs6000/rs6000.c (rs6000_expand_builtin): Do not do the switch statement mapping KF built-ins to TF built-ins if we don't have the proper ISA 3.0 assembler support. [gcc/testsuite] 2017-11-15 Michael Meissner * gcc.target/powerpc/bfp/bfp.exp: Look for *.c files, not *.c* files to prevent ~ files from getting recognized. * gcc.target/powerpc/dfp/dfp.exp: Likewise. * gcc.target/powerpc/vsu/vsu.exp: Likewise. From-SVN: r254839 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/rs6000.c | 6 +++++- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.target/powerpc/bfp/bfp.exp | 2 +- gcc/testsuite/gcc.target/powerpc/dfp/dfp.exp | 2 +- gcc/testsuite/gcc.target/powerpc/vsu/vsu.exp | 2 +- 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aeb2be82004..b5ef10ef28f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-11-15 Michael Meissner + + * config/rs6000/rs6000.c (rs6000_expand_builtin): Do not do the + switch statement mapping KF built-ins to TF built-ins if we don't + have the proper ISA 3.0 assembler support. + 2017-11-16 Jan Hubicka * tree-emutls.c (lower_emutls_data): Remove unused bb_freq. diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 80499fd198a..d19a4cfb806 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -16690,7 +16690,10 @@ rs6000_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, double (KFmode) or long double is IEEE 128-bit (TFmode). It is simpler if we only define one variant of the built-in function, and switch the code when defining it, rather than defining two built-ins and using the - overload table in rs6000-c.c to switch between the two. */ + overload table in rs6000-c.c to switch between the two. If we don't have + the proper assembler, don't do this switch because CODE_FOR_*kf* and + CODE_FOR_*tf* will be CODE_FOR_nothing. */ +#ifdef HAVE_AS_POWER9 if (FLOAT128_IEEE_P (TFmode)) switch (icode) { @@ -16711,6 +16714,7 @@ rs6000_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, case CODE_FOR_xsiexpqpf_kf: icode = CODE_FOR_xsiexpqpf_tf; break; case CODE_FOR_xststdcqp_kf: icode = CODE_FOR_xststdcqp_tf; break; } +#endif if (TARGET_DEBUG_BUILTIN) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4b2bb8b2257..180f4db0cdc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-11-15 Michael Meissner + + * gcc.target/powerpc/bfp/bfp.exp: Look for *.c files, not *.c* + files to prevent ~ files from getting recognized. + * gcc.target/powerpc/dfp/dfp.exp: Likewise. + * gcc.target/powerpc/vsu/vsu.exp: Likewise. + 2017-11-16 Henry Linjamäki * brig.dg/test/gimple/vector.hsail: Update for HSA registers' tree diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/bfp.exp b/gcc/testsuite/gcc.target/powerpc/bfp/bfp.exp index 1537ea8016f..ced58fc2e4e 100644 --- a/gcc/testsuite/gcc.target/powerpc/bfp/bfp.exp +++ b/gcc/testsuite/gcc.target/powerpc/bfp/bfp.exp @@ -34,7 +34,7 @@ load_lib torture-options.exp # Initialize. dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c*]] "" $DEFAULT_CFLAGS +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" $DEFAULT_CFLAGS # All done. dg-finish diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dfp.exp b/gcc/testsuite/gcc.target/powerpc/dfp/dfp.exp index 575c51ac395..5c192e48e7c 100644 --- a/gcc/testsuite/gcc.target/powerpc/dfp/dfp.exp +++ b/gcc/testsuite/gcc.target/powerpc/dfp/dfp.exp @@ -33,7 +33,7 @@ load_lib torture-options.exp # Initialize. dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c*]] "" $DEFAULT_CFLAGS +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" $DEFAULT_CFLAGS # All done. dg-finish diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vsu.exp b/gcc/testsuite/gcc.target/powerpc/vsu/vsu.exp index 1537ea8016f..ced58fc2e4e 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsu/vsu.exp +++ b/gcc/testsuite/gcc.target/powerpc/vsu/vsu.exp @@ -34,7 +34,7 @@ load_lib torture-options.exp # Initialize. dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c*]] "" $DEFAULT_CFLAGS +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" $DEFAULT_CFLAGS # All done. dg-finish -- 2.30.2