Patchwork Remove SWITCH_CURTAILS_COMPILATION

login
register
mail settings
Submitter Joseph S. Myers
Date Oct. 22, 2010, 6:45 p.m.
Message ID <Pine.LNX.4.64.1010221844470.21730@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/68905/
State New
Headers show

Comments

Joseph S. Myers - Oct. 22, 2010, 6:45 p.m.
My patch <http://gcc.gnu.org/ml/gcc-patches/2010-08/msg00949.html>
eliminated the use of the SWITCH_CURTAILS_COMPILATION target macro.
This patch removes the default definition and documentation of this
macro (which had no non-default definitions) and poisons it.

Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
commit?

2010-10-22  Joseph Myers  <joseph@codesourcery.com>

	* gcc.c (DEFAULT_SWITCH_CURTAILS_COMPILATION,
	SWITCH_CURTAILS_COMPILATION): Remove.
	* doc/tm.texi.in (SWITCH_CURTAILS_COMPILATION): Remove
	documentation.
	* doc/tm.texi: Regenerate.
	* system.h (SWITCH_CURTAILS_COMPILATION): Poison.
Richard Guenther - Oct. 22, 2010, 7:08 p.m.
On Fri, Oct 22, 2010 at 8:45 PM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> My patch <http://gcc.gnu.org/ml/gcc-patches/2010-08/msg00949.html>
> eliminated the use of the SWITCH_CURTAILS_COMPILATION target macro.
> This patch removes the default definition and documentation of this
> macro (which had no non-default definitions) and poisons it.
>
> Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
> commit?

Looks obvious.  Ok.

Thanks,
Richard.

> 2010-10-22  Joseph Myers  <joseph@codesourcery.com>
>
>        * gcc.c (DEFAULT_SWITCH_CURTAILS_COMPILATION,
>        SWITCH_CURTAILS_COMPILATION): Remove.
>        * doc/tm.texi.in (SWITCH_CURTAILS_COMPILATION): Remove
>        documentation.
>        * doc/tm.texi: Regenerate.
>        * system.h (SWITCH_CURTAILS_COMPILATION): Poison.
>
> Index: doc/tm.texi
> ===================================================================
> --- doc/tm.texi (revision 165823)
> +++ doc/tm.texi (working copy)
> @@ -126,21 +126,6 @@
>  additional options.
>  @end defmac
>
> -@defmac SWITCH_CURTAILS_COMPILATION (@var{char})
> -A C expression which determines whether the option @option{-@var{char}}
> -stops compilation before the generation of an executable.  The value is
> -boolean, nonzero if the option does stop an executable from being
> -generated, zero otherwise.
> -
> -By default, this macro is defined as
> -@code{DEFAULT_SWITCH_CURTAILS_COMPILATION}, which handles the standard
> -options properly.  You need not define
> -@code{SWITCH_CURTAILS_COMPILATION} unless you wish to add additional
> -options which affect the generation of an executable.  Any redefinition
> -should call @code{DEFAULT_SWITCH_CURTAILS_COMPILATION} and then check
> -for additional options.
> -@end defmac
> -
>  @defmac TARGET_OPTION_TRANSLATE_TABLE
>  If defined, a list of pairs of strings, the first of which is a
>  potential command line target to the @file{gcc} driver program, and the
> Index: doc/tm.texi.in
> ===================================================================
> --- doc/tm.texi.in      (revision 165823)
> +++ doc/tm.texi.in      (working copy)
> @@ -126,21 +126,6 @@
>  additional options.
>  @end defmac
>
> -@defmac SWITCH_CURTAILS_COMPILATION (@var{char})
> -A C expression which determines whether the option @option{-@var{char}}
> -stops compilation before the generation of an executable.  The value is
> -boolean, nonzero if the option does stop an executable from being
> -generated, zero otherwise.
> -
> -By default, this macro is defined as
> -@code{DEFAULT_SWITCH_CURTAILS_COMPILATION}, which handles the standard
> -options properly.  You need not define
> -@code{SWITCH_CURTAILS_COMPILATION} unless you wish to add additional
> -options which affect the generation of an executable.  Any redefinition
> -should call @code{DEFAULT_SWITCH_CURTAILS_COMPILATION} and then check
> -for additional options.
> -@end defmac
> -
>  @defmac TARGET_OPTION_TRANSLATE_TABLE
>  If defined, a list of pairs of strings, the first of which is a
>  potential command line target to the @file{gcc} driver program, and the
> Index: gcc.c
> ===================================================================
> --- gcc.c       (revision 165823)
> +++ gcc.c       (working copy)
> @@ -859,17 +859,6 @@
>  static struct user_specs *user_specs_head, *user_specs_tail;
>
>
> -#ifdef HAVE_TARGET_EXECUTABLE_SUFFIX
> -/* This defines which switches stop a full compilation.  */
> -#define DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR) \
> -  ((CHAR) == 'c' || (CHAR) == 'S' || (CHAR) == 'E')
> -
> -#ifndef SWITCH_CURTAILS_COMPILATION
> -#define SWITCH_CURTAILS_COMPILATION(CHAR) \
> -  DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR)
> -#endif
> -#endif
> -
>  /* Record the mapping from file suffixes for compilation specs.  */
>
>  struct compiler
> Index: system.h
> ===================================================================
> --- system.h    (revision 165823)
> +++ system.h    (working copy)
> @@ -775,7 +775,8 @@
>        ASM_OUTPUT_SHARED_LOCAL ASM_MAKE_LABEL_LINKONCE                    \
>        STACK_CHECK_PROBE_INTERVAL STACK_CHECK_PROBE_LOAD                  \
>        ORDER_REGS_FOR_LOCAL_ALLOC FUNCTION_OUTGOING_VALUE                 \
> -       ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES
> +       ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES  \
> +       SWITCH_CURTAILS_COMPILATION
>
>  /* Hooks that are no longer used.  */
>  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE  \
>
> --
> Joseph S. Myers
> joseph@codesourcery.com
>

Patch

Index: doc/tm.texi
===================================================================
--- doc/tm.texi	(revision 165823)
+++ doc/tm.texi	(working copy)
@@ -126,21 +126,6 @@ 
 additional options.
 @end defmac
 
-@defmac SWITCH_CURTAILS_COMPILATION (@var{char})
-A C expression which determines whether the option @option{-@var{char}}
-stops compilation before the generation of an executable.  The value is
-boolean, nonzero if the option does stop an executable from being
-generated, zero otherwise.
-
-By default, this macro is defined as
-@code{DEFAULT_SWITCH_CURTAILS_COMPILATION}, which handles the standard
-options properly.  You need not define
-@code{SWITCH_CURTAILS_COMPILATION} unless you wish to add additional
-options which affect the generation of an executable.  Any redefinition
-should call @code{DEFAULT_SWITCH_CURTAILS_COMPILATION} and then check
-for additional options.
-@end defmac
-
 @defmac TARGET_OPTION_TRANSLATE_TABLE
 If defined, a list of pairs of strings, the first of which is a
 potential command line target to the @file{gcc} driver program, and the
Index: doc/tm.texi.in
===================================================================
--- doc/tm.texi.in	(revision 165823)
+++ doc/tm.texi.in	(working copy)
@@ -126,21 +126,6 @@ 
 additional options.
 @end defmac
 
-@defmac SWITCH_CURTAILS_COMPILATION (@var{char})
-A C expression which determines whether the option @option{-@var{char}}
-stops compilation before the generation of an executable.  The value is
-boolean, nonzero if the option does stop an executable from being
-generated, zero otherwise.
-
-By default, this macro is defined as
-@code{DEFAULT_SWITCH_CURTAILS_COMPILATION}, which handles the standard
-options properly.  You need not define
-@code{SWITCH_CURTAILS_COMPILATION} unless you wish to add additional
-options which affect the generation of an executable.  Any redefinition
-should call @code{DEFAULT_SWITCH_CURTAILS_COMPILATION} and then check
-for additional options.
-@end defmac
-
 @defmac TARGET_OPTION_TRANSLATE_TABLE
 If defined, a list of pairs of strings, the first of which is a
 potential command line target to the @file{gcc} driver program, and the
Index: gcc.c
===================================================================
--- gcc.c	(revision 165823)
+++ gcc.c	(working copy)
@@ -859,17 +859,6 @@ 
 static struct user_specs *user_specs_head, *user_specs_tail;
 
 
-#ifdef HAVE_TARGET_EXECUTABLE_SUFFIX
-/* This defines which switches stop a full compilation.  */
-#define DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR) \
-  ((CHAR) == 'c' || (CHAR) == 'S' || (CHAR) == 'E')
-
-#ifndef SWITCH_CURTAILS_COMPILATION
-#define SWITCH_CURTAILS_COMPILATION(CHAR) \
-  DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR)
-#endif
-#endif
-
 /* Record the mapping from file suffixes for compilation specs.  */
 
 struct compiler
Index: system.h
===================================================================
--- system.h	(revision 165823)
+++ system.h	(working copy)
@@ -775,7 +775,8 @@ 
 	ASM_OUTPUT_SHARED_LOCAL ASM_MAKE_LABEL_LINKONCE			   \
 	STACK_CHECK_PROBE_INTERVAL STACK_CHECK_PROBE_LOAD		   \
 	ORDER_REGS_FOR_LOCAL_ALLOC FUNCTION_OUTGOING_VALUE		   \
-	ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES
+	ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES  \
+	SWITCH_CURTAILS_COMPILATION
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\