From 4900146ce0cf227aee88a1bd3b152c9394c64771 Mon Sep 17 00:00:00 2001 From: Bill Schmidt Date: Tue, 6 Mar 2018 01:56:41 +0000 Subject: [PATCH] rs6000-builtin.def (rs6000_speculation_barrier): Rename to ppc_speculation_barrier. [gcc] 2018-03-05 Bill Schmidt * config/rs6000/rs6000-builtin.def (rs6000_speculation_barrier): Rename to ppc_speculation_barrier. * config/rs6000/rs6000.c (rs6000_init_builtins): Rename builtin to __builtin_ppc_speculation_barrier. [gcc/testsuite] 2018-03-05 Bill Schmidt * gcc.target/powerpc/spec-barr-1.c: Change called function name to __builtin_ppc_speculation_barrier. From-SVN: r258268 --- gcc/ChangeLog | 7 +++++++ gcc/config/rs6000/rs6000-builtin.def | 2 +- gcc/config/rs6000/rs6000.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/powerpc/spec-barr-1.c | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 716e77abc99..d90eaa52010 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-03-05 Bill Schmidt + + * config/rs6000/rs6000-builtin.def (rs6000_speculation_barrier): + Rename to ppc_speculation_barrier. + * config/rs6000/rs6000.c (rs6000_init_builtins): Rename builtin to + __builtin_ppc_speculation_barrier. + 2018-03-05 Jakub Jelinek PR target/84700 diff --git a/gcc/config/rs6000/rs6000-builtin.def b/gcc/config/rs6000/rs6000-builtin.def index f9548a0c405..9942d65be7c 100644 --- a/gcc/config/rs6000/rs6000-builtin.def +++ b/gcc/config/rs6000/rs6000-builtin.def @@ -2348,7 +2348,7 @@ BU_DFP_MISC_2 (DSCRIQ, "dscriq", CONST, dfp_dscri_td) /* 0 argument void function that we pretend was added in ISA 2.06. It's a special nop recognized by 2018+ firmware for P7 and up, with speculation barrier semantics. */ -BU_P7_MISC_X (SPEC_BARRIER, "rs6000_speculation_barrier", MISC) +BU_P7_MISC_X (SPEC_BARRIER, "ppc_speculation_barrier", MISC) /* 1 argument BCD functions added in ISA 2.06. */ BU_P7_MISC_1 (CDTBCD, "cdtbcd", CONST, cdtbcd) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 5f22b6de5bb..9c8c0c83934 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -17249,7 +17249,7 @@ rs6000_init_builtins (void) ftype = build_function_type_list (void_type_node, NULL_TREE); def_builtin ("__builtin_cpu_init", ftype, RS6000_BUILTIN_CPU_INIT); - def_builtin ("__builtin_rs6000_speculation_barrier", ftype, + def_builtin ("__builtin_ppc_speculation_barrier", ftype, MISC_BUILTIN_SPEC_BARRIER); ftype = build_function_type_list (bool_int_type_node, const_ptr_type_node, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ca2986b6221..a9f66a320a6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-05 Bill Schmidt + + * gcc.target/powerpc/spec-barr-1.c: Change called function name to + __builtin_ppc_speculation_barrier. + 2018-03-05 Jakub Jelinek PR target/84700 diff --git a/gcc/testsuite/gcc.target/powerpc/spec-barr-1.c b/gcc/testsuite/gcc.target/powerpc/spec-barr-1.c index 94293ab3706..443938cd106 100644 --- a/gcc/testsuite/gcc.target/powerpc/spec-barr-1.c +++ b/gcc/testsuite/gcc.target/powerpc/spec-barr-1.c @@ -4,7 +4,7 @@ void foo () { - __builtin_rs6000_speculation_barrier (); + __builtin_ppc_speculation_barrier (); } /* { dg-final { scan-assembler "ori 31,31,0" } } */ -- 2.30.2