From 7aa7f2e34994c92d43a549a43b568a37e65a4232 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Sun, 3 Mar 2013 15:21:26 -0500 Subject: [PATCH] target.def (TARGET_OPTION_VALID_ATTRIBUTE_P): Update comments; the attribute is now called "target" instead of "option". 2013-03-03 Sandra Loosemore gcc/ * target.def (TARGET_OPTION_VALID_ATTRIBUTE_P): Update comments; the attribute is now called "target" instead of "option". (TARGET_OPTION_PRAGMA_PARSE): Likewise, for the pragma. * doc/tm.texi.in (Target Attributes): Likewise document the correct attribute/pragma name for TARGET_OPTION_VALID_P and TARGET_OPTION_PRAGMA_PARSE. Also copy-edit and correct markup. * doc/tm.texi: Regenerated. From-SVN: r196418 --- gcc/ChangeLog | 10 ++++++++++ gcc/doc/tm.texi | 36 ++++++++++++++++++------------------ gcc/doc/tm.texi.in | 36 ++++++++++++++++++------------------ gcc/target.def | 9 ++++----- 4 files changed, 50 insertions(+), 41 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dabc79ad32e1..e94430ad3e1f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2013-03-03 Sandra Loosemore + + * target.def (TARGET_OPTION_VALID_ATTRIBUTE_P): Update comments; + the attribute is now called "target" instead of "option". + (TARGET_OPTION_PRAGMA_PARSE): Likewise, for the pragma. + * doc/tm.texi.in (Target Attributes): Likewise document the correct + attribute/pragma name for TARGET_OPTION_VALID_P and + TARGET_OPTION_PRAGMA_PARSE. Also copy-edit and correct markup. + * doc/tm.texi: Regenerated. + 2013-03-02 David Holsgrove * config/microblaze/microblaze.c: diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index ce2b44d85452..cbbc82dfe39f 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -9848,40 +9848,40 @@ target specific attribute attached to it, it will not be inlined. @end deftypefn @deftypefn {Target Hook} bool TARGET_OPTION_VALID_ATTRIBUTE_P (tree @var{fndecl}, tree @var{name}, tree @var{args}, int @var{flags}) -This hook is called to parse the @code{attribute(option("..."))}, and -it allows the function to set different target machine compile time -options for the current function that might be different than the -options specified on the command line. The hook should return +This hook is called to parse @code{attribute(target("..."))}, which +allows setting target-specific options on individual functions. +These function-specific options may differ +from the options specified on the command line. The hook should return @code{true} if the options are valid. -The hook should set the @var{DECL_FUNCTION_SPECIFIC_TARGET} field in -the function declaration to hold a pointer to a target specific -@var{struct cl_target_option} structure. +The hook should set the @code{DECL_FUNCTION_SPECIFIC_TARGET} field in +the function declaration to hold a pointer to a target-specific +@code{struct cl_target_option} structure. @end deftypefn @deftypefn {Target Hook} void TARGET_OPTION_SAVE (struct cl_target_option *@var{ptr}) -This hook is called to save any additional target specific information -in the @var{struct cl_target_option} structure for function specific +This hook is called to save any additional target-specific information +in the @code{struct cl_target_option} structure for function-specific options. @xref{Option file format}. @end deftypefn @deftypefn {Target Hook} void TARGET_OPTION_RESTORE (struct cl_target_option *@var{ptr}) -This hook is called to restore any additional target specific -information in the @var{struct cl_target_option} structure for -function specific options. +This hook is called to restore any additional target-specific +information in the @code{struct cl_target_option} structure for +function-specific options. @end deftypefn @deftypefn {Target Hook} void TARGET_OPTION_PRINT (FILE *@var{file}, int @var{indent}, struct cl_target_option *@var{ptr}) -This hook is called to print any additional target specific -information in the @var{struct cl_target_option} structure for -function specific options. +This hook is called to print any additional target-specific +information in the @code{struct cl_target_option} structure for +function-specific options. @end deftypefn @deftypefn {Target Hook} bool TARGET_OPTION_PRAGMA_PARSE (tree @var{args}, tree @var{pop_target}) -This target hook parses the options for @code{#pragma GCC option} to -set the machine specific options for functions that occur later in the -input stream. The options should be the same as handled by the +This target hook parses the options for @code{#pragma GCC target}, which +sets the target-specific options for functions that occur later in the +input stream. The options accepted should be the same as those handled by the @code{TARGET_OPTION_VALID_ATTRIBUTE_P} hook. @end deftypefn diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index d6e7ce79f9dc..dfba947f51bb 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -9709,40 +9709,40 @@ target specific attribute attached to it, it will not be inlined. @end deftypefn @hook TARGET_OPTION_VALID_ATTRIBUTE_P -This hook is called to parse the @code{attribute(option("..."))}, and -it allows the function to set different target machine compile time -options for the current function that might be different than the -options specified on the command line. The hook should return +This hook is called to parse @code{attribute(target("..."))}, which +allows setting target-specific options on individual functions. +These function-specific options may differ +from the options specified on the command line. The hook should return @code{true} if the options are valid. -The hook should set the @var{DECL_FUNCTION_SPECIFIC_TARGET} field in -the function declaration to hold a pointer to a target specific -@var{struct cl_target_option} structure. +The hook should set the @code{DECL_FUNCTION_SPECIFIC_TARGET} field in +the function declaration to hold a pointer to a target-specific +@code{struct cl_target_option} structure. @end deftypefn @hook TARGET_OPTION_SAVE -This hook is called to save any additional target specific information -in the @var{struct cl_target_option} structure for function specific +This hook is called to save any additional target-specific information +in the @code{struct cl_target_option} structure for function-specific options. @xref{Option file format}. @end deftypefn @hook TARGET_OPTION_RESTORE -This hook is called to restore any additional target specific -information in the @var{struct cl_target_option} structure for -function specific options. +This hook is called to restore any additional target-specific +information in the @code{struct cl_target_option} structure for +function-specific options. @end deftypefn @hook TARGET_OPTION_PRINT -This hook is called to print any additional target specific -information in the @var{struct cl_target_option} structure for -function specific options. +This hook is called to print any additional target-specific +information in the @code{struct cl_target_option} structure for +function-specific options. @end deftypefn @hook TARGET_OPTION_PRAGMA_PARSE -This target hook parses the options for @code{#pragma GCC option} to -set the machine specific options for functions that occur later in the -input stream. The options should be the same as handled by the +This target hook parses the options for @code{#pragma GCC target}, which +sets the target-specific options for functions that occur later in the +input stream. The options accepted should be the same as those handled by the @code{TARGET_OPTION_VALID_ATTRIBUTE_P} hook. @end deftypefn diff --git a/gcc/target.def b/gcc/target.def index 63ba55e98d08..831cad8119b4 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -2774,9 +2774,9 @@ HOOK_VECTOR_END (emutls) #define HOOK_PREFIX "TARGET_OPTION_" HOOK_VECTOR (TARGET_OPTION_HOOKS, target_option_hooks) -/* Function to validate the attribute((option(...))) strings or NULL. If - the option is validated, it is assumed that DECL_FUNCTION_SPECIFIC will - be filled in in the function decl node. */ +/* Function to validate the attribute((target(...))) strings. If + the option is validated, the hook should also fill in + DECL_FUNCTION_SPECIFIC_TARGET in the function decl node. */ DEFHOOK (valid_attribute_p, "", @@ -2803,11 +2803,10 @@ DEFHOOK "", void, (FILE *file, int indent, struct cl_target_option *ptr), NULL) -/* Function to parse arguments to be validated for #pragma option, and to +/* Function to parse arguments to be validated for #pragma target, and to change the state if the options are valid. If the first argument is NULL, the second argument specifies the default options to use. Return true if the options are valid, and set the current state. */ -/* ??? The documentation in tm.texi is incomplete. */ DEFHOOK (pragma_parse, "",