Hi, This continues the cleanup of diagnostic messages in the rs6000 back end. The primary focus is to make sure that we use quoted strings with %qs, %<, %> as appropriate, and that option strings are separated from translatable strings to make things easier on the internationalization folks, as requested in PR79845. While working on this, I noticed a couple of places where the diagnostic strings result in excessively long lines, and cleaned these up as well.
One peculiarity I noticed, but did not attempt to address, is that a small handful of diagnostic strings are tagged with _N (). There doesn't seem to be any rhyme or reason to this. I expect it's a result of copy/paste from somewhere and most of these strings should be translated. But that's for another day (and probably another person). Bootstrapped and tested on powerpc64le-linux-gnu (POWER8 64-bit) and on powerpc64-linux-gnu (POWER7 32- and 64-bit) with no regressions. Is this okay for trunk? Thanks, Bill [gcc] 2017-08-10 Bill Schmidt <wschm...@linux.vnet.ibm.com> PR target/79845 * config/rs6000/linux64.h (INVALID_64BIT): Use quoted strings. * config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin): Likewise. * config/rs6000/rs6000.c (rs6000_init_hard_regno_mode_ok): Use quoted strings, and make more translator-friendly. (darwin_rs6000_override_options): Likewise. (rs6000_option_override_internal): Likewise. (rs6000_return_in_memory): Fix overlong line. (init_cmulative_args): Use quoted strings, and make more translator-friendly. (rs6000_pass_by_reference): Fix overlong line. (def_builtin): Use quoted strings. (altivec_expand_predicate_builtin): Use quoted strings, and make more translator-friendly. (htm_expand_builtin): Use quoted strings. (cpu_expand_builtin): Use quoted strings, and make more translator-friendly. (altivec_expand_builtin): Likewise. (paired_expand_predicate_builtin): Likewise. (rs6000_invalid_builtin): Likewise. (builtin_function_type): Use quoted strings. (rs6000_expand_split_stack_prologue): Use quoted strings, and make more translator-friendly. (rs6000_trampoline_init): Likewise. (rs6000_handle_altivec_attribute): Likewise. (rs6000_inner_target_options): Use quoted strings. (rs6000_disable_incompatible_switches): Likewise. * config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Use quoted strings, and make more translator-friendly. (SUBSUBTARGET_OVERRIDE_OPTIONS): Use quoted strings. [gcc/testsuite] 2017-08-10 Bill Schmidt <wschm...@linux.vnet.ibm.com> PR target/79845 * g++.dg/ext/altivec-cell-5.C: Adjust diagnostic strings. * gcc.target/powerpc/altivec-cell-5.c: Likewise. * gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-exp-1.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-exp-4.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-exp-5.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-sig-1.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-sig-4.c: Likewise. * gcc.target/powerpc/bfp/scalar-extract-sig-5.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-1.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-10.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-11.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-4.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-7.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-data-class-11.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-data-class-6.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-data-class-7.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-neg-2.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-neg-3.c: Likewise. * gcc.target/powerpc/bfp/scalar-test-neg-5.c: Likewise. * gcc.target/powerpc/bfp/vec-extract-exp-2.c: Likewise. * gcc.target/powerpc/bfp/vec-extract-exp-3.c: Likewise. * gcc.target/powerpc/bfp/vec-extract-sig-2.c: Likewise. * gcc.target/powerpc/bfp/vec-extract-sig-3.c: Likewise. * gcc.target/powerpc/bfp/vec-insert-exp-2.c: Likewise. * gcc.target/powerpc/bfp/vec-insert-exp-3.c: Likewise. * gcc.target/powerpc/bfp/vec-insert-exp-6.c: Likewise. * gcc.target/powerpc/bfp/vec-insert-exp-7.c: Likewise. * gcc.target/powerpc/bfp/vec-test-data-class-2.c: Likewise. * gcc.target/powerpc/bfp/vec-test-data-class-3.c: Likewise. * gcc.target/powerpc/byte-in-either-range-1.c: Likewise. * gcc.target/powerpc/byte-in-range-1.c: Likewise. * gcc.target/powerpc/byte-in-set-1.c: Likewise. * gcc.target/powerpc/byte-in-set-2.c: Likewise. * gcc.target/powerpc/cmpb-3.c: Likewise. * gcc.target/powerpc/crypto-builtin-2.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-1.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-11.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-16.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-21.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-26.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-31.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-36.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-41.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-46.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-51.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-56.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-6.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-61.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-66.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-71.c: Likewise. * gcc.target/powerpc/dfp/dtstsfi-76.c: Likewise. * gcc.target/powerpc/no-r11-3.c: Likewise. * gcc.target/powerpc/pr80098-1.c: Likewise. * gcc.target/powerpc/pr80098-2.c: Likewise. * gcc.target/powerpc/pr80098-3.c: Likewise. * gcc.target/powerpc/pr80098-4.c: Likewise. * gcc.target/powerpc/vsu/vec-all-nez-7.c: Likewise. * gcc.target/powerpc/vsu/vec-any-eqz-7.c: Likewise. * gcc.target/powerpc/vsu/vec-cmpnez-7.c: Likewise. * gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c: Likewise. * gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c: Likewise. * gcc.target/powerpc/vsu/vec-xl-len-12.c: Likewise. * gcc.target/powerpc/vsu/vec-xl-len-13.c: Likewise. * gcc.target/powerpc/vsu/vec-xlx-7.c: Likewise. * gcc.target/powerpc/vsu/vec-xrx-7.c: Likewise. * gcc.target/powerpc/vsu/vec-xst-len-12.c: Likewise. * gcc.target/powerpc/vsu/vec-xst-len-13.c: Likewise. Index: gcc/config/rs6000/linux64.h =================================================================== --- gcc/config/rs6000/linux64.h (revision 250965) +++ gcc/config/rs6000/linux64.h (working copy) @@ -85,7 +85,7 @@ extern int dot_symbols; #undef RS6000_ABI_NAME #define RS6000_ABI_NAME "linux" -#define INVALID_64BIT "-m%s not supported in this configuration" +#define INVALID_64BIT "%<-m%s%> not supported in this configuration" #define INVALID_32BIT INVALID_64BIT #ifdef LINUX64_DEFAULT_ABI_ELFv2 Index: gcc/config/rs6000/rs6000-c.c =================================================================== --- gcc/config/rs6000/rs6000-c.c (revision 250965) +++ gcc/config/rs6000/rs6000-c.c (working copy) @@ -5812,7 +5812,7 @@ altivec_resolve_overloaded_builtin (location_t loc types. */ if (nargs != 2) { - error ("vec_mul only accepts 2 arguments"); + error ("builtin %qs only accepts 2 arguments", "vec_mul"); return error_mark_node; } @@ -5863,7 +5863,7 @@ altivec_resolve_overloaded_builtin (location_t loc for it (prior to power 9). */ if (nargs != 2) { - error ("vec_cmpne only accepts 2 arguments"); + error ("builtin %qs only accepts 2 arguments", "vec_cmpne"); return error_mark_node; } @@ -5936,7 +5936,7 @@ altivec_resolve_overloaded_builtin (location_t loc { const char *name = fcode == ALTIVEC_BUILTIN_VEC_ADDE ? "vec_adde": "vec_sube"; - error ("%s only accepts 3 arguments", name); + error ("builtin %qs only accepts 3 arguments", name); return error_mark_node; } @@ -6019,7 +6019,7 @@ altivec_resolve_overloaded_builtin (location_t loc { const char *name = fcode == ALTIVEC_BUILTIN_VEC_ADDEC ? "vec_addec": "vec_subec"; - error ("%s only accepts 3 arguments", name); + error ("builtin %qs only accepts 3 arguments", name); return error_mark_node; } @@ -6128,17 +6128,18 @@ altivec_resolve_overloaded_builtin (location_t loc if (nargs == 0) { - error ("%s only accepts %d arguments", name, (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)+1 ); + error ("builtin %qs only accepts %d arguments", name, + (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)+1 ); return error_mark_node; } if (fcode == ALTIVEC_BUILTIN_VEC_SPLATS && nargs != 1) { - error ("%s only accepts 1 argument", name); + error ("builtin %qs only accepts 1 argument", name); return error_mark_node; } if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE && nargs != 2) { - error ("%s only accepts 2 arguments", name); + error ("builtin %qs only accepts 2 arguments", name); return error_mark_node; } /* Ignore promote's element argument. */ @@ -6204,7 +6205,7 @@ altivec_resolve_overloaded_builtin (location_t loc /* No second argument. */ if (nargs != 2) { - error ("vec_extract only accepts 2 arguments"); + error ("builtin %qs only accepts 2 arguments", "vec_extract"); return error_mark_node; } @@ -6373,7 +6374,7 @@ altivec_resolve_overloaded_builtin (location_t loc /* No second or third arguments. */ if (nargs != 3) { - error ("vec_insert only accepts 3 arguments"); + error ("builtin %qs only accepts 3 arguments", "vec_insert"); return error_mark_node; } @@ -6698,7 +6699,7 @@ altivec_resolve_overloaded_builtin (location_t loc if (nargs != 2) { - error ("__builtin_cmpb only accepts 2 arguments"); + error ("builtin %qs only accepts 2 arguments", "__builtin_cmpb"); return error_mark_node; } @@ -6739,7 +6740,8 @@ altivec_resolve_overloaded_builtin (location_t loc if (nargs != 2) { - error ("scalar_insert_exp only accepts 2 arguments"); + error ("builtin %qs only accepts 2 arguments", + "scalar_insert_exp"); return error_mark_node; } @@ -6802,8 +6804,8 @@ altivec_resolve_overloaded_builtin (location_t loc if (unsupported_builtin) { const char *name = rs6000_overloaded_builtin_name (fcode); - error ("builtin function %s not supported in this compiler configuration", - name); + error ("builtin function %qs not supported in this compiler " + "configuration", name); return error_mark_node; } } @@ -6810,7 +6812,7 @@ altivec_resolve_overloaded_builtin (location_t loc bad: { const char *name = rs6000_overloaded_builtin_name (fcode); - error ("invalid parameter combination for AltiVec intrinsic %s", name); + error ("invalid parameter combination for AltiVec intrinsic %qs", name); return error_mark_node; } } Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 250965) +++ gcc/config/rs6000/rs6000.c (working copy) @@ -3648,11 +3648,14 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p if (rs6000_recip_control) { if (!flag_finite_math_only) - warning (0, "-mrecip requires -ffinite-math or -ffast-math"); + warning (0, "%qs requires %qs or %qs", "-mrecip", "-ffinite-math", + "-ffast-math"); if (flag_trapping_math) - warning (0, "-mrecip requires -fno-trapping-math or -ffast-math"); + warning (0, "%qs requires %qs or %qs", "-mrecip", + "-fno-trapping-math", "-ffast-math"); if (!flag_reciprocal_math) - warning (0, "-mrecip requires -freciprocal-math or -ffast-math"); + warning (0, "%qs requires %qs or %qs", "-mrecip", "-freciprocal-math", + "-ffast-math"); if (flag_finite_math_only && !flag_trapping_math && flag_reciprocal_math) { if (RS6000_RECIP_HAVE_RE_P (SFmode) @@ -3752,7 +3755,7 @@ darwin_rs6000_override_options (void) if (TARGET_64BIT && ! TARGET_POWERPC64) { rs6000_isa_flags |= OPTION_MASK_POWERPC64; - warning (0, "-m64 requires PowerPC64 architecture, enabling"); + warning (0, "%qs requires PowerPC64 architecture, enabling", "-m64"); } if (flag_mkernel) { @@ -3934,8 +3937,9 @@ rs6000_option_override_internal (bool global_init_ && rs6000_alignment_flags == MASK_ALIGN_POWER && DEFAULT_ABI == ABI_DARWIN && TARGET_64BIT) - warning (0, "-malign-power is not supported for 64-bit Darwin;" - " it is incompatible with the installed C and C++ libraries"); + warning (0, "%qs is not supported for 64-bit Darwin;" + " it is incompatible with the installed C and C++ libraries", + "-malign-power"); /* Numerous experiment shows that IRA based loop pressure calculation works better for RTL loop invariant motion on targets @@ -4153,7 +4157,8 @@ rs6000_option_override_internal (bool global_init_ { rs6000_isa_flags &= ~OPTION_MASK_MULTIPLE; if ((rs6000_isa_flags_explicit & OPTION_MASK_MULTIPLE) != 0) - warning (0, "-mmultiple is not supported on little endian systems"); + warning (0, "%qs is not supported on little endian systems", + "-mmultiple"); } if (TARGET_STRING) @@ -4160,7 +4165,8 @@ rs6000_option_override_internal (bool global_init_ { rs6000_isa_flags &= ~OPTION_MASK_STRING; if ((rs6000_isa_flags_explicit & OPTION_MASK_STRING) != 0) - warning (0, "-mstring is not supported on little endian systems"); + warning (0, "%qs is not supported on little endian systems", + "-mstring"); } } @@ -4250,8 +4256,8 @@ rs6000_option_override_internal (bool global_init_ rs6000_isa_flags |= (ISA_3_0_MASKS_SERVER & ~ignore_masks); } else - error ("power9 target option is incompatible with -mcpu=<xxx> for " - "<xxx> less than power9"); + error ("power9 target option is incompatible with %<%s=<xxx>%> " + "for <xxx> less than power9", "-mcpu"); } else if ((ISA_3_0_MASKS_SERVER & rs6000_isa_flags_explicit) != (ISA_3_0_MASKS_SERVER & rs6000_isa_flags @@ -4258,7 +4264,8 @@ rs6000_option_override_internal (bool global_init_ & rs6000_isa_flags_explicit)) /* Enforce that none of the ISA_3_0_MASKS_SERVER flags were explicitly cleared. */ - error ("-mpower9-minmax incompatible with explicitly disabled options"); + error ("%qs incompatible with explicitly disabled options", + "-mpower9-minmax"); else rs6000_isa_flags |= ISA_3_0_MASKS_SERVER; } @@ -4282,7 +4289,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_CRYPTO && !TARGET_ALTIVEC) { if (rs6000_isa_flags_explicit & OPTION_MASK_CRYPTO) - error ("-mcrypto requires -maltivec"); + error ("%qs requires %qs", "-mcrypto", "-maltivec"); rs6000_isa_flags &= ~OPTION_MASK_CRYPTO; } @@ -4289,7 +4296,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_DIRECT_MOVE && !TARGET_VSX) { if (rs6000_isa_flags_explicit & OPTION_MASK_DIRECT_MOVE) - error ("-mdirect-move requires -mvsx"); + error ("%qs requires %qs", "-mdirect-move", "-mvsx"); rs6000_isa_flags &= ~OPTION_MASK_DIRECT_MOVE; } @@ -4296,7 +4303,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_P8_VECTOR && !TARGET_ALTIVEC) { if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR) - error ("-mpower8-vector requires -maltivec"); + error ("%qs requires %qs", "-mpower8-vector", "-maltivec"); rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR; } @@ -4304,7 +4311,7 @@ rs6000_option_override_internal (bool global_init_ { if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR) && (rs6000_isa_flags_explicit & OPTION_MASK_VSX)) - error ("-mpower8-vector requires -mvsx"); + error ("%qs requires %qs", "-mpower8-vector", "-mvsx"); else if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR) == 0) { rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR; @@ -4323,7 +4330,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_VSX_TIMODE && !TARGET_VSX) { if (rs6000_isa_flags_explicit & OPTION_MASK_VSX_TIMODE) - error ("-mvsx-timode requires -mvsx"); + error ("%qs requires %qs", "-mvsx-timode", "-mvsx"); rs6000_isa_flags &= ~OPTION_MASK_VSX_TIMODE; } @@ -4330,7 +4337,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_DFP && !TARGET_HARD_FLOAT) { if (rs6000_isa_flags_explicit & OPTION_MASK_DFP) - error ("-mhard-dfp requires -mhard-float"); + error ("%qs requires %qs", "-mhard-dfp", "-mhard-float"); rs6000_isa_flags &= ~OPTION_MASK_DFP; } @@ -4354,7 +4361,8 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_QUAD_MEMORY && !WORDS_BIG_ENDIAN) { if ((rs6000_isa_flags_explicit & OPTION_MASK_QUAD_MEMORY) != 0) - warning (0, N_("-mquad-memory is not available in little endian mode")); + warning (0, N_("-mquad-memory is not available in little endian " + "mode")); rs6000_isa_flags &= ~OPTION_MASK_QUAD_MEMORY; } @@ -4379,10 +4387,11 @@ rs6000_option_override_internal (bool global_init_ if (rs6000_isa_flags_explicit & OPTION_MASK_P8_FUSION) { if (TARGET_P8_FUSION_SIGN) - error ("-mpower8-fusion-sign requires -mpower8-fusion"); + error ("%qs requires %qs", "-mpower8-fusion-sign", + "-mpower8-fusion"); if (TARGET_TOC_FUSION) - error ("-mtoc-fusion requires -mpower8-fusion"); + error ("%qs requires %qs", "-mtoc-fusion", "-mpower8-fusion"); rs6000_isa_flags &= ~OPTION_MASK_P8_FUSION; } @@ -4399,7 +4408,7 @@ rs6000_option_override_internal (bool global_init_ error messages. However, if users have managed to select power9-fusion without selecting power8-fusion, they already know about undocumented flags. */ - error ("-mpower9-fusion requires -mpower8-fusion"); + error ("%qs requires %qs", "-mpower9-fusion", "-mpower8-fusion"); rs6000_isa_flags &= ~OPTION_MASK_P9_FUSION; } else @@ -4452,7 +4461,7 @@ rs6000_option_override_internal (bool global_init_ already know about undocumented flags. */ if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) && (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)) - error ("-mpower9-vector requires -mpower8-vector"); + error ("%qs requires %qs", "-mpower9-vector", "-mpower8-vector"); else if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) == 0) { rs6000_isa_flags &= ~OPTION_MASK_P9_VECTOR; @@ -4497,7 +4506,7 @@ rs6000_option_override_internal (bool global_init_ if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) && (rs6000_isa_flags_explicit & (OPTION_MASK_P9_DFORM_SCALAR | OPTION_MASK_P9_DFORM_VECTOR))) - error ("-mpower9-dform requires -mpower9-vector"); + error ("%qs requires %qs", "-mpower9-dform", "-mpower9-vector"); else if (rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) { rs6000_isa_flags &= @@ -4526,8 +4535,9 @@ rs6000_option_override_internal (bool global_init_ && ((rs6000_isa_flags_explicit & OPTION_MASK_P9_DFORM_VECTOR) || (rs6000_isa_flags_explicit & OPTION_MASK_P9_DFORM_SCALAR) || (TARGET_P9_DFORM_BOTH == 1))) - error ("-mpower9-dform, -mpower9-dform-vector, -mpower9-dform-scalar" - " require -mdirect-move"); + error ("%qs, %qs, %qs require %qs", "-mpower9-dform", + "-mpower9-dform-vector", "-mpower9-dform-scalar", + "-mdirect-move"); else if ((rs6000_isa_flags_explicit & OPTION_MASK_DIRECT_MOVE) == 0) { rs6000_isa_flags |= OPTION_MASK_DIRECT_MOVE; @@ -4558,7 +4568,7 @@ rs6000_option_override_internal (bool global_init_ { if (TARGET_ALLOW_MOVMISALIGN > 0 && global_options_set.x_TARGET_ALLOW_MOVMISALIGN) - error ("-mallow-movmisalign requires -mvsx"); + error ("%qs requires %qs", "-mallow-movmisalign", "-mvsx"); TARGET_ALLOW_MOVMISALIGN = 0; } @@ -4573,7 +4583,7 @@ rs6000_option_override_internal (bool global_init_ if (!TARGET_VSX) { if (rs6000_isa_flags_explicit & OPTION_MASK_EFFICIENT_UNALIGNED_VSX) - error ("-mefficient-unaligned-vsx requires -mvsx"); + error ("%qs requires %qs", "-mefficient-unaligned-vsx", "-mvsx"); rs6000_isa_flags &= ~OPTION_MASK_EFFICIENT_UNALIGNED_VSX; } @@ -4581,7 +4591,8 @@ rs6000_option_override_internal (bool global_init_ else if (!TARGET_ALLOW_MOVMISALIGN) { if (rs6000_isa_flags_explicit & OPTION_MASK_EFFICIENT_UNALIGNED_VSX) - error ("-mefficient-unaligned-vsx requires -mallow-movmisalign"); + error ("%qs requires %qs", "-munefficient-unaligned-vsx", + "-mallow-movmisalign"); rs6000_isa_flags &= ~OPTION_MASK_EFFICIENT_UNALIGNED_VSX; } @@ -4619,7 +4630,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_FLOAT128_KEYWORD) { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_KEYWORD) != 0) - error ("-mfloat128 requires VSX support"); + error ("%qs requires VSX support", "-mfloat128"); rs6000_isa_flags &= ~(OPTION_MASK_FLOAT128_TYPE | OPTION_MASK_FLOAT128_KEYWORD @@ -4629,7 +4640,7 @@ rs6000_option_override_internal (bool global_init_ else if (TARGET_FLOAT128_TYPE) { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_TYPE) != 0) - error ("-mfloat128-type requires VSX support"); + error ("%qs requires VSX support", "-mfloat128-type"); rs6000_isa_flags &= ~(OPTION_MASK_FLOAT128_TYPE | OPTION_MASK_FLOAT128_KEYWORD @@ -4645,7 +4656,7 @@ rs6000_option_override_internal (bool global_init_ { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_KEYWORD) != 0) { - error ("-mfloat128 requires -mfloat128-type"); + error ("%qs requires %qs", "-mfloat128", "-mfloat128-type"); rs6000_isa_flags &= ~(OPTION_MASK_FLOAT128_TYPE | OPTION_MASK_FLOAT128_KEYWORD | OPTION_MASK_FLOAT128_HW); @@ -4658,7 +4669,8 @@ rs6000_option_override_internal (bool global_init_ { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_HW) != 0) { - error ("-mfloat128-hardware requires -mfloat128-type"); + error ("%qs requires %qs", "-mfloat128-hardware", + "-mfloat128-type"); rs6000_isa_flags &= ~OPTION_MASK_FLOAT128_HW; } else @@ -4681,7 +4693,7 @@ rs6000_option_override_internal (bool global_init_ && (rs6000_isa_flags & ISA_3_0_MASKS_IEEE) != ISA_3_0_MASKS_IEEE) { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_HW) != 0) - error ("-mfloat128-hardware requires full ISA 3.0 support"); + error ("%qs requires full ISA 3.0 support", "-mfloat128-hardware"); rs6000_isa_flags &= ~OPTION_MASK_FLOAT128_HW; } @@ -4689,7 +4701,7 @@ rs6000_option_override_internal (bool global_init_ if (TARGET_FLOAT128_HW && !TARGET_64BIT) { if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT128_HW) != 0) - error ("-mfloat128-hardware requires -m64"); + error ("%qs requires %qs", "-mfloat128-hardware", "-m64"); rs6000_isa_flags &= ~OPTION_MASK_FLOAT128_HW; } @@ -4753,8 +4765,8 @@ rs6000_option_override_internal (bool global_init_ rs6000_veclib_handler = rs6000_builtin_vectorized_libmass; else { - error ("unknown vectorization library ABI type (%s) for " - "-mveclibabi= switch", rs6000_veclibabi_name); + error ("unknown vectorization library ABI type (%qs) for " + "%qs switch", rs6000_veclibabi_name, "-mveclibabi="); ret = false; } } @@ -4970,13 +4982,13 @@ rs6000_option_override_internal (bool global_init_ errno = 0; long offset = strtol (str, &endp, 0); if (!*str || *endp || errno) - error ("%qs is not a valid number " - "in -mstack-protector-guard-offset=", str); + error ("%qs is not a valid number in %qs", str, + "-mstack-protector-guard-offset="); if (!IN_RANGE (offset, -0x8000, 0x7fff) || (TARGET_64BIT && (offset & 3))) - error ("%qs is not a valid offset " - "in -mstack-protector-guard-offset=", str); + error ("%qs is not a valid offset in %qs", str, + "-mstack-protector-guard-offset="); rs6000_stack_protector_guard_offset = offset; } @@ -4987,8 +4999,8 @@ rs6000_option_override_internal (bool global_init_ int reg = decode_reg_name (str); if (!IN_RANGE (reg, 1, 31)) - error ("%qs is not a valid base register " - "in -mstack-protector-guard-reg=", str); + error ("%qs is not a valid base register in %qs", str, + "-mstack-protector-guard-reg="); rs6000_stack_protector_guard_reg = reg; } @@ -4995,7 +5007,7 @@ rs6000_option_override_internal (bool global_init_ if (rs6000_stack_protector_guard == SSP_TLS && !IN_RANGE (rs6000_stack_protector_guard_reg, 1, 31)) - error ("-mstack-protector-guard=tls needs a valid base register"); + error ("%qs needs a valid base register", "-mstack-protector-guard=tls"); if (global_init_p) { @@ -5293,7 +5305,7 @@ rs6000_option_override_internal (bool global_init_ if (i == ARRAY_SIZE (recip_options)) { - error ("unknown option for -mrecip=%s", q); + error ("unknown option for %<%s=%s%>", "-mrecip", q); invert = false; mask = 0; ret = false; @@ -11227,7 +11239,8 @@ rs6000_return_in_memory (const_tree type, const_tr if (!warned_for_return_big_vectors) { warning (OPT_Wpsabi, "GCC vector returned by reference: " - "non-standard ABI extension with no compatibility guarantee"); + "non-standard ABI extension with no compatibility " + "guarantee"); warned_for_return_big_vectors = true; } return true; @@ -11389,8 +11402,8 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, tree f && ALTIVEC_VECTOR_MODE (TYPE_MODE (TREE_TYPE (fntype)))) { error ("cannot return value in vector register because" - " altivec instructions are disabled, use -maltivec" - " to enable them"); + " altivec instructions are disabled, use %qs" + " to enable them", "-maltivec"); } } @@ -11856,8 +11869,8 @@ rs6000_function_arg_advance_1 (CUMULATIVE_ARGS *cu if (!TARGET_ALTIVEC) error ("cannot pass argument in vector register because" - " altivec instructions are disabled, use -maltivec" - " to enable them"); + " altivec instructions are disabled, use %qs" + " to enable them", "-maltivec"); /* PowerPC64 Linux and AIX allocate GPRs for a vector argument even if it is going to be passed in a vector register. @@ -12774,7 +12787,8 @@ rs6000_pass_by_reference (cumulative_args_t cum AT if (!warned_for_pass_big_vectors) { warning (OPT_Wpsabi, "GCC vector passed by reference: " - "non-standard ABI extension with no compatibility guarantee"); + "non-standard ABI extension with no compatibility " + "guarantee"); warned_for_pass_big_vectors = true; } return 1; @@ -13564,7 +13578,8 @@ def_builtin (const char *name, tree type, enum rs6 if (rs6000_builtin_decls[(int)code]) fatal_error (input_location, - "internal error: builtin function %s already processed", name); + "internal error: builtin function %qs already processed", + name); rs6000_builtin_decls[(int)code] = t = add_builtin_function (name, type, (int)code, BUILT_IN_MD, NULL, NULL_TREE); @@ -14164,7 +14179,8 @@ altivec_expand_predicate_builtin (enum insn_code i if (TREE_CODE (cr6_form) != INTEGER_CST) { - error ("argument 1 of __builtin_altivec_predicate must be a constant"); + error ("argument 1 of %qs must be a constant", + "__builtin_altivec_predicate"); return const0_rtx; } else @@ -14221,7 +14237,8 @@ altivec_expand_predicate_builtin (enum insn_code i emit_insn (gen_cr6_test_for_lt_reverse (target)); break; default: - error ("argument 1 of __builtin_altivec_predicate is out of range"); + error ("argument 1 of %qs is out of range", + "__builtin_altivec_predicate"); break; } @@ -14728,7 +14745,7 @@ htm_expand_builtin (tree exp, rtx target, bool * e { size_t uns_fcode = (size_t)fcode; const char *name = rs6000_builtin_info[uns_fcode].name; - error ("builtin %s is only valid in 64-bit mode", name); + error ("builtin %qs is only valid in 64-bit mode", name); return const0_rtx; } @@ -14925,7 +14942,7 @@ cpu_expand_builtin (enum rs6000_builtins fcode, tr if (TREE_CODE (arg) != STRING_CST) { - error ("builtin %s only accepts a string argument", + error ("builtin %qs only accepts a string argument", rs6000_builtin_info[(size_t) fcode].name); return const0_rtx; } @@ -14944,7 +14961,7 @@ cpu_expand_builtin (enum rs6000_builtins fcode, tr if (cpuid == NULL_RTX) { /* Invalid CPU argument. */ - error ("cpu %s is an invalid argument to builtin %s", + error ("cpu %qs is an invalid argument to builtin %qs", cpu, rs6000_builtin_info[(size_t) fcode].name); return const0_rtx; } @@ -14972,8 +14989,8 @@ cpu_expand_builtin (enum rs6000_builtins fcode, tr if (mask == NULL_RTX) { /* Invalid HWCAP argument. */ - error ("hwcap %s is an invalid argument to builtin %s", - hwcap, rs6000_builtin_info[(size_t) fcode].name); + error ("%s %qs is an invalid argument to builtin %qs", + "hwcap", hwcap, rs6000_builtin_info[(size_t) fcode].name); return const0_rtx; } @@ -14998,7 +15015,7 @@ cpu_expand_builtin (enum rs6000_builtins fcode, tr cpu_builtin_p = true; #else - warning (0, "%s needs GLIBC (2.23 and newer) that exports hardware " + warning (0, "builtin %qs needs GLIBC (2.23 and newer) that exports hardware " "capability bits", rs6000_builtin_info[(size_t) fcode].name); /* For old LIBCs, always return FALSE. */ @@ -15673,7 +15690,7 @@ altivec_expand_builtin (tree exp, rtx target, bool if (TREE_CODE (arg0) != INTEGER_CST || TREE_INT_CST_LOW (arg0) & ~0x3) { - error ("argument to dss must be a 2-bit unsigned literal"); + error ("argument to %qs must be a 2-bit unsigned literal", "dss"); return const0_rtx; } @@ -15721,7 +15738,7 @@ altivec_expand_builtin (tree exp, rtx target, bool if (TREE_CODE (arg1) != INTEGER_CST || TREE_INT_CST_LOW (arg1) > 12) { - error ("second argument to vec_vextract4b must be 0..12"); + error ("second argument to %qs must be 0..12", "vec_vextract4b"); return expand_call (exp, target, false); } break; @@ -15738,7 +15755,7 @@ altivec_expand_builtin (tree exp, rtx target, bool if (TREE_CODE (arg2) != INTEGER_CST || TREE_INT_CST_LOW (arg2) > 12) { - error ("third argument to vec_vinsert4b must be 0..12"); + error ("third argument to %qs must be 0..12", "vec_vinsert4b"); return expand_call (exp, target, false); } break; @@ -15992,7 +16009,8 @@ paired_expand_predicate_builtin (enum insn_code ic if (TREE_CODE (form) != INTEGER_CST) { - error ("argument 1 of __builtin_paired_predicate must be a constant"); + error ("argument 1 of %s must be a constant", + "__builtin_paired_predicate"); return const0_rtx; } else @@ -16039,7 +16057,8 @@ paired_expand_predicate_builtin (enum insn_code ic emit_insn (gen_move_from_CR_ov_bit (target, scratch)); return target; default: - error ("argument 1 of __builtin_paired_predicate is out of range"); + error ("argument 1 of %qs is out of range", + "__builtin_paired_predicate"); return const0_rtx; } @@ -16060,45 +16079,49 @@ rs6000_invalid_builtin (enum rs6000_builtins fncod gcc_assert (name != NULL); if ((fnmask & RS6000_BTM_CELL) != 0) - error ("builtin function %s is only valid for the cell processor", name); + error ("builtin function %qs is only valid for the cell processor", name); else if ((fnmask & RS6000_BTM_VSX) != 0) - error ("builtin function %s requires the -mvsx option", name); + error ("builtin function %qs requires the %qs option", name, "-mvsx"); else if ((fnmask & RS6000_BTM_HTM) != 0) - error ("builtin function %s requires the -mhtm option", name); + error ("builtin function %qs requires the %qs option", name, "-mhtm"); else if ((fnmask & RS6000_BTM_ALTIVEC) != 0) - error ("builtin function %s requires the -maltivec option", name); + error ("builtin function %qs requires the %qs option", name, "-maltivec"); else if ((fnmask & RS6000_BTM_PAIRED) != 0) - error ("builtin function %s requires the -mpaired option", name); + error ("builtin function %qs requires the %qs option", name, "-mpaired"); else if ((fnmask & (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR)) == (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR)) - error ("builtin function %s requires the -mhard-dfp and" - " -mpower8-vector options", name); + error ("builtin function %qs requires the %qs and %qs options", + name, "-mhard-dfp", "-mpower8-vector"); else if ((fnmask & RS6000_BTM_DFP) != 0) - error ("builtin function %s requires the -mhard-dfp option", name); + error ("builtin function %qs requires the %qs option", name, "-mhard-dfp"); else if ((fnmask & RS6000_BTM_P8_VECTOR) != 0) - error ("builtin function %s requires the -mpower8-vector option", name); + error ("builtin function %qs requires the %qs option", name, + "-mpower8-vector"); else if ((fnmask & (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT)) == (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT)) - error ("builtin function %s requires the -mcpu=power9 and" - " -m64 options", name); + error ("builtin function %qs requires the %qs and %qs options", + name, "-mcpu=power9", "-m64"); else if ((fnmask & RS6000_BTM_P9_VECTOR) != 0) - error ("builtin function %s requires the -mcpu=power9 option", name); + error ("builtin function %qs requires the %qs option", name, + "-mcpu=power9"); else if ((fnmask & (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT)) == (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT)) - error ("builtin function %s requires the -mcpu=power9 and" - " -m64 options", name); + error ("builtin function %qs requires the %qs and %qs options", + name, "-mcpu=power9", "-m64"); else if ((fnmask & RS6000_BTM_P9_MISC) == RS6000_BTM_P9_MISC) - error ("builtin function %s requires the -mcpu=power9 option", name); + error ("builtin function %qs requires the %qs option", name, + "-mcpu=power9"); else if ((fnmask & (RS6000_BTM_HARD_FLOAT | RS6000_BTM_LDBL128)) == (RS6000_BTM_HARD_FLOAT | RS6000_BTM_LDBL128)) - error ("builtin function %s requires the -mhard-float and" - " -mlong-double-128 options", name); + error ("builtin function %qs requires the %qs and %qs options", + name, "-mhard-float", "-mlong-double-128"); else if ((fnmask & RS6000_BTM_HARD_FLOAT) != 0) - error ("builtin function %s requires the -mhard-float option", name); + error ("builtin function %qs requires the %qs option", name, + "-mhard-float"); else if ((fnmask & RS6000_BTM_FLOAT128) != 0) - error ("builtin function %s requires the -mfloat128 option", name); + error ("builtin function %qs requires the %qs option", name, "-mfloat128"); else - error ("builtin function %s is not supported with the current options", + error ("builtin function %qs is not supported with the current options", name); } @@ -18059,8 +18082,8 @@ builtin_function_type (machine_mode mode_ret, mach if (!ret_type) fatal_error (input_location, - "internal error: builtin function %s had an unexpected " - "return type %s", name, GET_MODE_NAME (h.mode[0])); + "internal error: builtin function %qs had an unexpected " + "return type %qs", name, GET_MODE_NAME (h.mode[0])); for (i = 0; i < (int) ARRAY_SIZE (arg_type); i++) arg_type[i] = NULL_TREE; @@ -18076,8 +18099,8 @@ builtin_function_type (machine_mode mode_ret, mach if (!arg_type[i]) fatal_error (input_location, - "internal error: builtin function %s, argument %d " - "had unexpected argument type %s", name, i, + "internal error: builtin function %qs, argument %d " + "had unexpected argument type %qs", name, i, GET_MODE_NAME (m)); } @@ -28974,7 +28997,7 @@ rs6000_expand_split_stack_prologue (void) if (global_regs[29]) { - error ("-fsplit-stack uses register r29"); + error ("%qs uses register r29", "-fsplit-stack"); inform (DECL_SOURCE_LOCATION (global_regs_decl[29]), "conflicts with %qD", global_regs_decl[29]); } @@ -32273,7 +32296,7 @@ rs6000_trampoline_init (rtx m_tramp, tree fndecl, if (!TARGET_POINTERS_TO_NESTED_FUNCTIONS) error ("you cannot take the address of a nested function if you use " - "the -mno-pointers-to-nested-functions option."); + "the %qs option", "-mno-pointers-to-nested-functions"); fnmem = gen_const_mem (Pmode, force_reg (Pmode, fnaddr)); fn_reg = gen_reg_rtx (Pmode); @@ -32367,7 +32390,7 @@ rs6000_handle_altivec_attribute (tree *node, { if (TARGET_64BIT) error ("use of %<long%> in AltiVec types is invalid for " - "64-bit code without -mvsx"); + "64-bit code without %qs", "-mvsx"); else if (rs6000_warn_altivec_long) warning (0, "use of %<long%> in AltiVec types is deprecated; " "use %<int%>"); @@ -32374,10 +32397,11 @@ rs6000_handle_altivec_attribute (tree *node, } else if (type == long_long_unsigned_type_node || type == long_long_integer_type_node) - error ("use of %<long long%> in AltiVec types is invalid without " + error ("use of %<long long%> in AltiVec types is invalid without %qs", "-mvsx"); else if (type == double_type_node) - error ("use of %<double%> in AltiVec types is invalid without -mvsx"); + error ("use of %<double%> in AltiVec types is invalid without %qs", + "-mvsx"); } switch (altivec_type) @@ -36326,12 +36350,12 @@ rs6000_inner_target_options (tree args, bool attr_ } if (cpu_opt) - error ("invalid cpu \"%s\" for %s\"%s\"%s", cpu_opt, eprefix, + error ("invalid cpu %qs for %s%qs%s", cpu_opt, eprefix, q, esuffix); else if (not_valid_p) - error ("%s\"%s\"%s is not allowed", eprefix, q, esuffix); + error ("%s%qs%s is not allowed", eprefix, q, esuffix); else - error ("%s\"%s\"%s is invalid", eprefix, q, esuffix); + error ("%s%qs%s is invalid", eprefix, q, esuffix); } } } @@ -36856,7 +36880,7 @@ rs6000_disable_incompatible_switches (void) if ((set_flags & rs6000_opt_masks[j].mask) != 0) { set_flags &= ~rs6000_opt_masks[j].mask; - error ("-mno-%s turns off -m%s", + error ("%<-mno-%s%> turns off %<-m%s%>", flags[i].name, rs6000_opt_masks[j].name); } @@ -36873,7 +36897,7 @@ rs6000_disable_incompatible_switches (void) && (rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) != 0 && TARGET_P9_DFORM_BOTH > 0) { - error ("-mno-power9-vector turns off -mpower9-dform"); + error ("%qs turns off %qs", "-mno-power9-vector", "-mpower9-dform"); TARGET_P9_DFORM_BOTH = 0; } Index: gcc/config/rs6000/sysv4.h =================================================================== --- gcc/config/rs6000/sysv4.h (revision 250965) +++ gcc/config/rs6000/sysv4.h (working copy) @@ -108,7 +108,7 @@ do { \ else \ { \ rs6000_current_abi = ABI_V4; \ - error ("bad value for -mcall-%s", rs6000_abi_name); \ + error ("bad value for %<%s-%s%>", "-mcall", rs6000_abi_name); \ } \ \ if (rs6000_sdata_name) \ @@ -124,7 +124,7 @@ do { \ else if (!strcmp (rs6000_sdata_name, "eabi")) \ rs6000_sdata = SDATA_EABI; \ else \ - error ("bad value for -msdata=%s", rs6000_sdata_name); \ + error ("bad value for %<%s=%s%>", "-msdata", rs6000_sdata_name);\ } \ else if (DEFAULT_ABI == ABI_V4) \ { \ @@ -141,8 +141,8 @@ do { \ (rs6000_sdata == SDATA_EABI || rs6000_sdata == SDATA_SYSV)) \ { \ rs6000_sdata = SDATA_DATA; \ - error ("-mrelocatable and -msdata=%s are incompatible", \ - rs6000_sdata_name); \ + error ("%qs and %<%s=%s%> are incompatible", rs6000_sdata_name, \ + "-mrelocatable", "-msdata"); \ } \ \ else if (flag_pic && DEFAULT_ABI == ABI_V4 \ @@ -150,9 +150,9 @@ do { \ || rs6000_sdata == SDATA_SYSV)) \ { \ rs6000_sdata = SDATA_DATA; \ - error ("-f%s and -msdata=%s are incompatible", \ + error ("%<-f%s%> and %<%s=%s%> are incompatible", \ (flag_pic > 1) ? "PIC" : "pic", \ - rs6000_sdata_name); \ + "-msdata", rs6000_sdata_name); \ } \ \ if ((rs6000_sdata != SDATA_NONE && DEFAULT_ABI != ABI_V4) \ @@ -159,8 +159,8 @@ do { \ || (rs6000_sdata == SDATA_EABI && !TARGET_EABI)) \ { \ rs6000_sdata = SDATA_NONE; \ - error ("-msdata=%s and -mcall-%s are incompatible", \ - rs6000_sdata_name, rs6000_abi_name); \ + error ("%<%s=%s%> and %<%s-%s%> are incompatible", \ + "-msdata", "-mcall", rs6000_sdata_name, rs6000_abi_name); \ } \ \ targetm.have_srodata_section = rs6000_sdata == SDATA_EABI; \ @@ -168,26 +168,27 @@ do { \ if (TARGET_RELOCATABLE && !TARGET_MINIMAL_TOC) \ { \ rs6000_isa_flags |= OPTION_MASK_MINIMAL_TOC; \ - error ("-mrelocatable and -mno-minimal-toc are incompatible"); \ + error ("%qs and %qs are incompatible", "-mrelocatable", \ + "-mno-minimal-toc"); \ } \ \ if (TARGET_RELOCATABLE && rs6000_current_abi != ABI_V4) \ { \ rs6000_isa_flags &= ~OPTION_MASK_RELOCATABLE; \ - error ("-mrelocatable and -mcall-%s are incompatible", \ - rs6000_abi_name); \ + error ("%qs and %<%s-%s%> are incompatible", \ + "-mrelocatable", "-mcall", rs6000_abi_name); \ } \ \ if (!TARGET_64BIT && flag_pic > 1 && rs6000_current_abi != ABI_V4) \ { \ flag_pic = 0; \ - error ("-fPIC and -mcall-%s are incompatible", \ - rs6000_abi_name); \ + error ("%qs and %<%s-%s%> are incompatible", \ + "-fPIC", "-mcall", rs6000_abi_name); \ } \ \ if (TARGET_SECURE_PLT != secure_plt) \ { \ - error ("-msecure-plt not supported by your assembler"); \ + error ("%qs not supported by your assembler", "-msecure-plt"); \ } \ \ if (flag_pic > 1 && DEFAULT_ABI == ABI_V4) \ @@ -215,7 +216,7 @@ do { \ # define SUBSUBTARGET_OVERRIDE_OPTIONS \ do { \ if ((TARGET_DEFAULT ^ rs6000_isa_flags) & OPTION_MASK_64BIT) \ - error ("-m%s not supported in this configuration", \ + error ("%<-m%s%> not supported in this configuration", \ (rs6000_isa_flags & OPTION_MASK_64BIT) ? "64" : "32"); \ } while (0) #endif Index: gcc/testsuite/g++.dg/ext/altivec-cell-5.C =================================================================== --- gcc/testsuite/g++.dg/ext/altivec-cell-5.C (revision 250965) +++ gcc/testsuite/g++.dg/ext/altivec-cell-5.C (working copy) @@ -8,18 +8,18 @@ int main(int argc, char **argv) { vector float t; - vec_promote(); /* { dg-error "vec_promote only accepts 2" } */ - vec_promote(1.0f); /* { dg-error "vec_promote only accepts 2" } */ - vec_promote(1.0f, 2, 3); /* { dg-error "vec_promote only accepts 2" } */ - vec_extract (); /* { dg-error "vec_extract only accepts 2" } */ - vec_extract (t); /* { dg-error "vec_extract only accepts 2" } */ + vec_promote(); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_promote(1.0f); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_promote(1.0f, 2, 3); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_extract (); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ + vec_extract (t); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ vec_extract (t, 2); - vec_extract (t, 2, 5, 6); /* { dg-error "vec_extract only accepts 2" } */ - vec_splats (); /* { dg-error "vec_splats only accepts 1" } */ - vec_splats (t, 3); /* { dg-error "vec_splats only accepts 1" } */ - vec_insert (); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t, 3); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t, 3, 2, 4, 6, 6); /* { dg-error "vec_insert only accepts 3" } */ + vec_extract (t, 2, 5, 6); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ + vec_splats (); /* { dg-error "builtin 'vec_splats' only accepts 1" } */ + vec_splats (t, 3); /* { dg-error "builtin 'vec_splats' only accepts 1" } */ + vec_insert (); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t, 3); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t, 3, 2, 4, 6, 6); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ return 0; } Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c (working copy) @@ -8,18 +8,18 @@ int main(int argc, char **argv) { vector float t; - vec_promote(); /* { dg-error "vec_promote only accepts 2" } */ - vec_promote(1.0f); /* { dg-error "vec_promote only accepts 2" } */ - vec_promote(1.0f, 2, 3); /* { dg-error "vec_promote only accepts 2" } */ - vec_extract (); /* { dg-error "vec_extract only accepts 2" } */ - vec_extract (t); /* { dg-error "vec_extract only accepts 2" } */ + vec_promote(); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_promote(1.0f); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_promote(1.0f, 2, 3); /* { dg-error "builtin 'vec_promote' only accepts 2" } */ + vec_extract (); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ + vec_extract (t); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ vec_extract (t, 2); - vec_extract (t, 2, 5, 6); /* { dg-error "vec_extract only accepts 2" } */ - vec_splats (); /* { dg-error "vec_splats only accepts 1" } */ - vec_splats (t, 3); /* { dg-error "vec_splats only accepts 1" } */ - vec_insert (); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t, 3); /* { dg-error "vec_insert only accepts 3" } */ - vec_insert (t, 3, 2, 4, 6, 6); /* { dg-error "vec_insert only accepts 3" } */ + vec_extract (t, 2, 5, 6); /* { dg-error "builtin 'vec_extract' only accepts 2" } */ + vec_splats (); /* { dg-error "builtin 'vec_splats' only accepts 1" } */ + vec_splats (t, 3); /* { dg-error "builtin 'vec_splats' only accepts 1" } */ + vec_insert (); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t, 3); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ + vec_insert (t, 3, 2, 4, 6, 6); /* { dg-error "builtin 'vec_insert' only accepts 3" } */ return 0; } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c (working copy) @@ -12,5 +12,5 @@ compare_exponents_eq (double *exponent1_p, double double exponent1 = *exponent1_p; double exponent2 = *exponent2_p; - return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2); /* { dg-error "builtin function __builtin_vsx_scalar_cmp_exp_dp_eq requires" } */ + return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2); /* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_eq' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c (working copy) @@ -12,5 +12,5 @@ compare_exponents_gt (double *exponent1_p, double double exponent1 = *exponent1_p; double exponent2 = *exponent2_p; - return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2); /* { dg-error "builtin function __builtin_vsx_scalar_cmp_exp_dp_gt requires" } */ + return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2); /* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_gt' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c (working copy) @@ -12,5 +12,5 @@ compare_exponents_lt (double *exponent1_p, double double exponent1 = *exponent1_p; double exponent2 = *exponent2_p; - return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2); /* { dg-error "builtin function __builtin_vsx_scalar_cmp_exp_dp_lt requires" } */ + return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2); /* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_lt' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c (working copy) @@ -12,5 +12,5 @@ compare_exponents_unordered (double *exponent1_p, double exponent1 = *exponent1_p; double exponent2 = *exponent2_p; - return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2); /* { dg-error "builtin function __builtin_vsx_scalar_cmp_exp_dp_unordered requires" } */ + return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2); /* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_unordered' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c (working copy) @@ -12,7 +12,7 @@ get_exponent (double *p) { double source = *p; - return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function __builtin_vsx_scalar_extract_exp requires" } */ + return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_exp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c (working copy) @@ -15,7 +15,7 @@ get_exponent (double *p) { double source = *p; - return scalar_extract_exp (source); /* { dg-error "builtin function __builtin_vec_scalar_extract_exp not supported in this compiler configuration" } */ + return scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vec_scalar_extract_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c (working copy) @@ -12,7 +12,7 @@ get_exponent (__ieee128 *p) { __ieee128 source = *p; - return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function __builtin_vsx_scalar_extract_expq requires" } */ + return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_expq' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c (working copy) @@ -15,7 +15,7 @@ get_exponent (__ieee128 *p) { __ieee128 source = *p; - return scalar_extract_exp (source); /* { dg-error "builtin function __builtin_vec_scalar_extract_exp not supported in this compiler configuration" } */ + return scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vec_scalar_extract_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c (working copy) @@ -12,5 +12,5 @@ get_significand (double *p) { double source = *p; - return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function __builtin_vsx_scalar_extract_sig requires" } */ + return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_sig' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c (working copy) @@ -13,5 +13,5 @@ get_significand (double *p) { double source = *p; - return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function __builtin_vec_scalar_extract_sig not supported in this compiler configuration" } */ + return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function '__builtin_vec_scalar_extract_sig' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c (working copy) @@ -12,5 +12,5 @@ get_significand (__ieee128 *p) { __ieee128 source = *p; - return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function __builtin_vsx_scalar_extract_sigq requires" } */ + return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_sigq' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c (working copy) @@ -13,5 +13,5 @@ get_significand (__ieee128 *p) { __ieee128 source = *p; - return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function __builtin_vec_scalar_extract_sig not supported in this compiler configuration" } */ + return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function '__builtin_vec_scalar_extract_sig' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c (working copy) @@ -14,5 +14,5 @@ insert_exponent (unsigned long long int *significa unsigned long long int significand = *significand_p; unsigned long long int exponent = *exponent_p; - return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vsx_scalar_insert_exp requires" } */ + return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c (working copy) @@ -14,5 +14,5 @@ insert_exponent (__ieee128 *significand_p, __ieee128 significand = *significand_p; unsigned long long int exponent = *exponent_p; - return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vsx_scalar_insert_exp_qp requires" } */ + return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_qp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c (working copy) @@ -17,5 +17,5 @@ insert_exponent (__ieee128 *significand_p, __ieee128 significand = *significand_p; unsigned long long int exponent = *exponent_p; - return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vec_scalar_insert_exp not supported in this compiler configuration" } */ + return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c (working copy) @@ -17,5 +17,5 @@ insert_exponent (unsigned long long int *significa unsigned long long int significand = *significand_p; unsigned long long int exponent = *exponent_p; - return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vec_scalar_insert_exp not supported in this compiler configuration" } */ + return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c (working copy) @@ -14,5 +14,5 @@ insert_exponent (double *significand_p, double significand = *significand_p; unsigned long long int exponent = *exponent_p; - return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vsx_scalar_insert_exp_dp requires" } */ + return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c (working copy) @@ -17,5 +17,5 @@ insert_exponent (double *significand_p, double significand = *significand_p; unsigned long long int exponent = *exponent_p; - return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vec_scalar_insert_exp not supported in this compiler configuration" } */ + return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c (working copy) @@ -14,5 +14,5 @@ insert_exponent (unsigned __int128 *significand_p, unsigned __int128 significand = *significand_p; unsigned long long int exponent = *exponent_p; - return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vsx_scalar_insert_exp_q requires" } */ + return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_q' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c (working copy) @@ -17,5 +17,5 @@ insert_exponent (unsigned __int128 *significand_p, unsigned __int128 significand = *significand_p; /* { dg-error "'__int128' is not supported on this target" } */ unsigned long long int exponent = *exponent_p; - return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function __builtin_vec_scalar_insert_exp not supported in this compiler configuration" } */ + return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c (working copy) @@ -11,5 +11,5 @@ test_data_class (__ieee128 *p) { __ieee128 source = *p; - return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function __builtin_vsx_scalar_test_data_class_qp requires" } */ + return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_qp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c (working copy) @@ -11,5 +11,5 @@ test_data_class (double *p) { double source = *p; - return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function __builtin_vsx_scalar_test_data_class_dp requires" } */ + return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c (working copy) @@ -11,5 +11,5 @@ test_data_class (float *p) { float source = *p; - return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function __builtin_vsx_scalar_test_data_class_sp requires" } */ + return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c (working copy) @@ -11,5 +11,5 @@ test_neg (float *p) { float source = *p; - return __builtin_vec_scalar_test_neg_sp (source); /* { dg-error "builtin function __builtin_vsx_scalar_test_neg_sp requires" } */ + return __builtin_vec_scalar_test_neg_sp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c (working copy) @@ -11,5 +11,5 @@ test_neg (double *p) { double source = *p; - return __builtin_vec_scalar_test_neg_dp (source); /* { dg-error "builtin function __builtin_vsx_scalar_test_neg_dp requires" } */ + return __builtin_vec_scalar_test_neg_dp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c (working copy) @@ -11,5 +11,5 @@ test_neg (__ieee128 *p) { __ieee128 source = *p; - return __builtin_vec_scalar_test_neg_qp (source); /* { dg-error "builtin function __builtin_vsx_scalar_test_neg_qp requires" } */ + return __builtin_vec_scalar_test_neg_qp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_qp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c (working copy) @@ -10,5 +10,5 @@ get_exponents (__vector double *p) { __vector double source = *p; - return __builtin_vec_extract_exp (source); /* { dg-error "builtin function __builtin_vsx_extract_exp_dp requires" } */ + return __builtin_vec_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_extract_exp_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c (working copy) @@ -10,5 +10,5 @@ get_exponents (__vector float *p) { __vector float source = *p; - return __builtin_vec_extract_exp (source); /* { dg-error "builtin function __builtin_vsx_extract_exp_sp requires" } */ + return __builtin_vec_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_extract_exp_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c (working copy) @@ -10,5 +10,5 @@ get_significands (__vector double *p) { __vector double source = *p; - return __builtin_vec_extract_sig (source); /* { dg-error "builtin function __builtin_vsx_extract_sig_dp requires" } */ + return __builtin_vec_extract_sig (source); /* { dg-error "builtin function '__builtin_vsx_extract_sig_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c (working copy) @@ -10,5 +10,5 @@ get_significands (__vector float *p) { __vector float source = *p; - return __builtin_vec_extract_sig (source); /* { dg-error "builtin function __builtin_vsx_extract_sig_sp requires" } */ + return __builtin_vec_extract_sig (source); /* { dg-error "builtin function '__builtin_vsx_extract_sig_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c (working copy) @@ -12,5 +12,5 @@ make_floats (__vector unsigned int *significands_p __vector unsigned int significands = *significands_p; __vector unsigned int exponents = *exponents_p; - return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function __builtin_vsx_insert_exp_sp requires" } */ + return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c (working copy) @@ -12,5 +12,5 @@ make_doubles (__vector unsigned long long int *sig __vector unsigned long long int significands = *significands_p; __vector unsigned long long int exponents = *exponents_p; - return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function __builtin_vsx_insert_exp_dp requires" } */ + return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c (working copy) @@ -12,5 +12,5 @@ make_floats (__vector float *significands_p, __vector float significands = *significands_p; __vector unsigned int exponents = *exponents_p; - return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function __builtin_vsx_insert_exp_sp requires" } */ + return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c (working copy) @@ -12,5 +12,5 @@ make_doubles (__vector double *significands_p, __vector double significands = *significands_p; __vector unsigned long long int exponents = *exponents_p; - return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function __builtin_vsx_insert_exp_dp requires" } */ + return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c (working copy) @@ -10,5 +10,5 @@ get_data_class_flags (__vector double *p) { __vector double source = *p; - return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function __builtin_vsx_test_data_class_dp requires" } */ + return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function '__builtin_vsx_test_data_class_dp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c (working copy) @@ -10,5 +10,5 @@ get_data_class_flags (__vector float *p) { __vector float source = *p; - return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function __builtin_vsx_test_data_class_sp requires" } */ + return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function '__builtin_vsx_test_data_class_sp' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c (working copy) @@ -18,5 +18,5 @@ test_byte_in_either_range (unsigned char b, range_encoding = ((first_hi_bound << 24) | (first_lo_bound << 16) | (second_hi_bound << 8) | second_lo_bound); - return __builtin_byte_in_either_range (b, range_encoding); /* { dg-error "builtin function __builtin_scalar_byte_in_either_range requires" } */ + return __builtin_byte_in_either_range (b, range_encoding); /* { dg-error "builtin function '__builtin_scalar_byte_in_either_range' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c (working copy) @@ -11,6 +11,6 @@ test_byte_in_range (unsigned char b, unsigned char low_range, unsigned char high_range) { unsigned int range_encoding = (high_range << 8) | low_range; - return __builtin_byte_in_range (b, range_encoding); /* { dg-error "builtin function __builtin_scalar_byte_in_range requires" } */ + return __builtin_byte_in_range (b, range_encoding); /* { dg-error "builtin function '__builtin_scalar_byte_in_range' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c (working copy) @@ -10,5 +10,5 @@ int test_byte_in_set (unsigned char b, unsigned long long set_members) { - return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function __builtin_scalar_byte_in_set requires" } */ + return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function '__builtin_scalar_byte_in_set' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c (working copy) @@ -12,5 +12,5 @@ int test_byte_in_set (unsigned char b, unsigned long long set_members) { - return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function __builtin_byte_in_set not supported in this compiler configuration" } */ + return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function '__builtin_byte_in_set' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/cmpb-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/cmpb-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/cmpb-3.c (working copy) @@ -9,7 +9,7 @@ void abort (); long long int do_compare (long long int a, long long int b) { - return __builtin_cmpb (a, b); /* { dg-error "builtin function __builtin_cmpb not supported in this compiler configuration" } */ + return __builtin_cmpb (a, b); /* { dg-error "builtin function '__builtin_cmpb' not supported in this compiler configuration" } */ } void expect (long long int pattern, long long int value) Index: gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c (working copy) @@ -6,14 +6,14 @@ void use_builtins_d (__vector unsigned long long *p, __vector unsigned long long *q, __vector unsigned long long *r, __vector unsigned long long *s) { - p[0] = __builtin_crypto_vcipher (q[0], r[0]); /* { dg-error "builtin function __builtin_crypto_vcipher is not supported with the current options" } */ - p[1] = __builtin_crypto_vcipherlast (q[1], r[1]); /* { dg-error "builtin function __builtin_crypto_vcipherlast is not supported with the current options" } */ - p[2] = __builtin_crypto_vncipher (q[2], r[2]); /* { dg-error "builtin function __builtin_crypto_vncipher is not supported with the current options" } */ - p[3] = __builtin_crypto_vncipherlast (q[3], r[3]); /* { dg-error "builtin function __builtin_crypto_vncipherlast is not supported with the current options" } */ + p[0] = __builtin_crypto_vcipher (q[0], r[0]); /* { dg-error "builtin function '__builtin_crypto_vcipher' is not supported with the current options" } */ + p[1] = __builtin_crypto_vcipherlast (q[1], r[1]); /* { dg-error "builtin function '__builtin_crypto_vcipherlast' is not supported with the current options" } */ + p[2] = __builtin_crypto_vncipher (q[2], r[2]); /* { dg-error "builtin function '__builtin_crypto_vncipher' is not supported with the current options" } */ + p[3] = __builtin_crypto_vncipherlast (q[3], r[3]); /* { dg-error "builtin function '__builtin_crypto_vncipherlast' is not supported with the current options" } */ p[4] = __builtin_crypto_vpermxor (q[4], r[4], s[4]); p[5] = __builtin_crypto_vpmsumd (q[5], r[5]); - p[6] = __builtin_crypto_vshasigmad (q[6], 1, 15); /* { dg-error "builtin function __builtin_crypto_vshasigmad is not supported with the current options" } */ - p[7] = __builtin_crypto_vsbox (q[7]); /* { dg-error "builtin function __builtin_crypto_vsbox is not supported with the current options" } */ + p[6] = __builtin_crypto_vshasigmad (q[6], 1, 15); /* { dg-error "builtin function '__builtin_crypto_vshasigmad' is not supported with the current options" } */ + p[7] = __builtin_crypto_vsbox (q[7]); /* { dg-error "builtin function '__builtin_crypto_vsbox' is not supported with the current options" } */ } void use_builtins_w (__vector unsigned int *p, __vector unsigned int *q, __vector unsigned int *r, __vector unsigned int *s) @@ -20,7 +20,7 @@ void use_builtins_w (__vector unsigned int *p, __v { p[0] = __builtin_crypto_vpermxor (q[0], r[0], s[0]); p[1] = __builtin_crypto_vpmsumw (q[1], r[1]); - p[2] = __builtin_crypto_vshasigmaw (q[2], 1, 15); /* { dg-error "builtin function __builtin_crypto_vshasigmaw is not supported with the current options" } */ + p[2] = __builtin_crypto_vshasigmaw (q[2], 1, 15); /* { dg-error "builtin function '__builtin_crypto_vshasigmaw' is not supported with the current options" } */ } void use_builtins_h (__vector unsigned short *p, __vector unsigned short *q, __vector unsigned short *r, __vector unsigned short *s) Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_lt (5, source); /* { dg-error "builtin function __builtin_dtstsfi_lt_dd requires" } */ + return __builtin_dfp_dtstsfi_lt (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_lt_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_lt_dd (5, source); /* { dg-error "builtin function __builtin_dtstsfi_lt_dd requires" } */ + return __builtin_dfp_dtstsfi_lt_dd (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_lt_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_lt_td (5, source); /* { dg-error "builtin function __builtin_dtstsfi_lt_td requires" } */ + return __builtin_dfp_dtstsfi_lt_td (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_lt_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_gt (5, source); /* { dg-error "builtin function __builtin_dtstsfi_gt_dd requires" } */ + return __builtin_dfp_dtstsfi_gt (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_gt_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_gt (5, source); /* { dg-error "builtin function __builtin_dtstsfi_gt_td requires" } */ + return __builtin_dfp_dtstsfi_gt (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_gt_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_gt_dd (5, source); /* { dg-error "builtin function __builtin_dtstsfi_gt_dd requires" } */ + return __builtin_dfp_dtstsfi_gt_dd (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_gt_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_gt_td (5, source); /* { dg-error "builtin function __builtin_dtstsfi_gt_td requires" } */ + return __builtin_dfp_dtstsfi_gt_td (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_gt_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_eq (5, source); /* { dg-error "builtin function __builtin_dtstsfi_eq_dd requires" } */ + return __builtin_dfp_dtstsfi_eq (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_eq_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_eq (5, source); /* { dg-error "builtin function __builtin_dtstsfi_eq_td requires" } */ + return __builtin_dfp_dtstsfi_eq (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_eq_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_eq_dd (5, source); /* { dg-error "builtin function __builtin_dtstsfi_eq_dd requires" } */ + return __builtin_dfp_dtstsfi_eq_dd (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_eq_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_eq_td (5, source); /* { dg-error "builtin function __builtin_dtstsfi_eq_td requires" } */ + return __builtin_dfp_dtstsfi_eq_td (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_eq_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_lt (5, source); /* { dg-error "builtin function __builtin_dtstsfi_lt_td requires" } */ + return __builtin_dfp_dtstsfi_lt (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_lt_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_ov (5, source); /* { dg-error "builtin function __builtin_dtstsfi_ov_dd requires" } */ + return __builtin_dfp_dtstsfi_ov (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_ov_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_ov (5, source); /* { dg-error "builtin function __builtin_dtstsfi_ov_td requires" } */ + return __builtin_dfp_dtstsfi_ov (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_ov_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c (working copy) @@ -10,6 +10,6 @@ int doTestBCDSignificance (_Decimal64 *p) { _Decimal64 source = *p; - return __builtin_dfp_dtstsfi_ov_dd (5, source); /* { dg-error "builtin function __builtin_dtstsfi_ov_dd requires" } */ + return __builtin_dfp_dtstsfi_ov_dd (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_ov_dd' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c (working copy) @@ -10,7 +10,7 @@ int doTestBCDSignificance (_Decimal128 *p) { _Decimal128 source = *p; - return __builtin_dfp_dtstsfi_ov_td (5, source); /* { dg-error "builtin function __builtin_dtstsfi_ov_td requires" } */ + return __builtin_dfp_dtstsfi_ov_td (5, source); /* { dg-error "builtin function '__builtin_dtstsfi_ov_td' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/no-r11-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/no-r11-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/no-r11-3.c (working copy) @@ -6,7 +6,7 @@ extern void ext_call (int (func) (void)); int -outer_func (int init) /* { dg-error "-mno-pointers-to-nested-functions option" } */ +outer_func (int init) /* { dg-error "'-mno-pointers-to-nested-functions' option" } */ { int value = init; Index: gcc/testsuite/gcc.target/powerpc/pr80098-1.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/pr80098-1.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/pr80098-1.c (working copy) @@ -5,5 +5,5 @@ int i; -/* { dg-error "-mno-power9-vector turns off -mpower9-minmax" "PR80098" { target *-*-* } 0 } */ -/* { dg-error "-mno-power9-vector turns off -mpower9-dform" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-power9-vector' turns off '-mpower9-minmax'" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-power9-vector' turns off '-mpower9-dform'" "PR80098" { target *-*-* } 0 } */ Index: gcc/testsuite/gcc.target/powerpc/pr80098-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/pr80098-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/pr80098-2.c (working copy) @@ -5,5 +5,5 @@ int i; -/* { dg-error "-mno-power8-vector turns off -mdirect-move" "PR80098" { target *-*-* } 0 } */ -/* { dg-error "-mno-power8-vector turns off -mcrypto" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-power8-vector' turns off '-mdirect-move'" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-power8-vector' turns off '-mcrypto'" "PR80098" { target *-*-* } 0 } */ Index: gcc/testsuite/gcc.target/powerpc/pr80098-3.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/pr80098-3.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/pr80098-3.c (working copy) @@ -5,5 +5,5 @@ int i; -/* { dg-error "-mno-vsx turns off -mdirect-move" "PR80098" { target *-*-* } 0 } */ -/* { dg-error "-mno-vsx turns off -mcrypto" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-vsx' turns off '-mdirect-move'" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-vsx' turns off '-mcrypto'" "PR80098" { target *-*-* } 0 } */ Index: gcc/testsuite/gcc.target/powerpc/pr80098-4.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/pr80098-4.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/pr80098-4.c (working copy) @@ -5,4 +5,4 @@ int i; -/* { dg-error "-mno-vsx turns off -mvsx-timode" "PR80098" { target *-*-* } 0 } */ +/* { dg-error "'-mno-vsx' turns off '-mvsx-timode'" "PR80098" { target *-*-* } 0 } */ Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c (working copy) @@ -12,5 +12,5 @@ test_all_not_equal_and_not_zero (vector unsigned s vector unsigned short arg_1 = *arg1_p; vector unsigned short arg_2 = *arg2_p; - return __builtin_vec_vcmpnez_p (__CR6_LT, arg_1, arg_2); /* { dg-error "builtin function __builtin_vec_vcmpnez_p not supported in this compiler configuration" } */ + return __builtin_vec_vcmpnez_p (__CR6_LT, arg_1, arg_2); /* { dg-error "builtin function '__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c (working copy) @@ -11,5 +11,5 @@ test_any_equal (vector unsigned int *arg1_p, vecto vector unsigned int arg_1 = *arg1_p; vector unsigned int arg_2 = *arg2_p; - return __builtin_vec_vcmpnez_p (__CR6_LT_REV, arg_1, arg_2); /* { dg-error "builtin function __builtin_vec_vcmpnez_p not supported in this compiler configuration" } */ + return __builtin_vec_vcmpnez_p (__CR6_LT_REV, arg_1, arg_2); /* { dg-error "builtin function '__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c (working copy) @@ -11,5 +11,5 @@ fetch_data (vector unsigned int *arg1_p, vector un vector unsigned int arg_1 = *arg1_p; vector unsigned int arg_2 = *arg2_p; - return __builtin_vec_vcmpnez (arg_1, arg_2); /* { dg-error "builtin function __builtin_altivec_vcmpnezw requires the -mcpu=power9 option" } */ + return __builtin_vec_vcmpnez (arg_1, arg_2); /* { dg-error "builtin function '__builtin_altivec_vcmpnezw' requires the '-mcpu=power9' option" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c (working copy) @@ -10,5 +10,5 @@ count_leading_zero_byte_bits (vector unsigned char { vector unsigned char arg_1 = *arg1_p; - return __builtin_vec_vclzlsbb (arg_1); /* { dg-error "builtin function __builtin_altivec_vclzlsbb requires the -mcpu=power9 option" } */ + return __builtin_vec_vclzlsbb (arg_1); /* { dg-error "builtin function '__builtin_altivec_vclzlsbb' requires the '-mcpu=power9' option" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c (working copy) @@ -10,5 +10,5 @@ count_trailing_zero_byte_bits (vector unsigned cha { vector unsigned char arg_1 = *arg1_p; - return __builtin_vec_vctzlsbb (arg_1); /* { dg-error "builtin function __builtin_altivec_vctzlsbb requires the -mcpu=power9 option" } */ + return __builtin_vec_vctzlsbb (arg_1); /* { dg-error "builtin function '__builtin_altivec_vctzlsbb' requires the '-mcpu=power9' option" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c (working copy) @@ -12,5 +12,5 @@ __vector float fetch_data (float *address, size_t length) { - return __builtin_vec_lxvl (address, length); /* { dg-error "builtin function __builtin_vsx_lxvl requires" } */ + return __builtin_vec_lxvl (address, length); /* { dg-error "builtin function '__builtin_vsx_lxvl' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c (working copy) @@ -14,5 +14,5 @@ __vector float fetch_data (float *address, size_t length) { - return __builtin_vec_lxvl (address, length); /* { dg-error "builtin function __builtin_vec_lxvl not supported in this compiler configuration" } */ + return __builtin_vec_lxvl (address, length); /* { dg-error "builtin function '__builtin_vec_lxvl' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c (working copy) @@ -11,5 +11,5 @@ fetch_data (unsigned int offset, vector signed int { vector signed int data = *datap; - return __builtin_vec_vextulx (offset, data); /* { dg-error "builtin function __builtin_altivec_vextuwlx requires" } */ + return __builtin_vec_vextulx (offset, data); /* { dg-error "builtin function '__builtin_altivec_vextuwlx' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c (working copy) @@ -11,5 +11,5 @@ fetch_data (unsigned short offset, vector signed s { vector signed short data = *datap; - return __builtin_vec_vexturx (offset, data); /* { dg-error "builtin function __builtin_altivec_vextuhrx requires" } */ + return __builtin_vec_vexturx (offset, data); /* { dg-error "builtin function '__builtin_altivec_vextuhrx' requires" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c (working copy) @@ -14,5 +14,5 @@ store_data (vector double *datap, double *address, { vector double data = *datap; - __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function __builtin_vec_stxvl not supported in this compiler configuration" } */ + __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function '__builtin_vec_stxvl' not supported in this compiler configuration" } */ } Index: gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c =================================================================== --- gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c (revision 250965) +++ gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c (working copy) @@ -15,5 +15,5 @@ store_data (vector double *datap, double *address, { vector double data = *datap; - __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function __builtin_altivec_stxvl requires" } */ + __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function '__builtin_altivec_stxvl' requires" } */ }