From d68411092e47af805ef8a8530dbc75f0669e4c63 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 25 Jun 2010 12:12:01 +0100 Subject: [PATCH] pa.h (MODIFY_TARGET_NAME): Remove. * config/pa/pa.h (MODIFY_TARGET_NAME): Remove. * doc/tm.texi (MODIFY_TARGET_NAME): Don't document. * gcc.c (enum add_del, struct modify_target, modify_target): Remove. (process_command): Remove code conditional on MODIFY_TARGET_NAME. * system.h (MODIFY_TARGET_NAME): Poison. From-SVN: r161372 --- gcc/ChangeLog | 9 ++++++ gcc/config/pa/pa.h | 11 +------- gcc/doc/tm.texi | 25 ----------------- gcc/gcc.c | 69 ---------------------------------------------- gcc/system.h | 2 +- 5 files changed, 11 insertions(+), 105 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 52583f118a1..d56312a6f7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2010-06-25 Joseph Myers + + * config/pa/pa.h (MODIFY_TARGET_NAME): Remove. + * doc/tm.texi (MODIFY_TARGET_NAME): Don't document. + * gcc.c (enum add_del, struct modify_target, modify_target): + Remove. + (process_command): Remove code conditional on MODIFY_TARGET_NAME. + * system.h (MODIFY_TARGET_NAME): Poison. + 2010-06-25 Alan Modra * doc/invoke.texi: Delete mcmodel=medium from powerpc options. diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 4b10a0a3b9b..8a18289b0d2 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for the HP Spectrum. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) of Cygnus Support and Tim Moore (moore@defmacro.cs.utah.edu) of the Center for @@ -222,15 +222,6 @@ do { \ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" #endif -/* This macro defines command-line switches that modify the default - target name. - - The definition is be an initializer for an array of structures. Each - array element has have three elements: the switch name, one of the - enumeration codes ADD or DELETE to indicate whether the string should be - inserted or deleted, and the string to be inserted or deleted. */ -#define MODIFY_TARGET_NAME {{"-32", DELETE, "64"}, {"-64", ADD, "64"}} - /* Make gcc agree with */ #define SIZE_TYPE "unsigned int" diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index b118c657391..87329e019d8 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -523,31 +523,6 @@ Cross compilers do not search either @file{/usr/local/include} or its replacement. @end defmac -@defmac MODIFY_TARGET_NAME -Define this macro if you wish to define command-line switches that -modify the default target name. - -For each switch, you can include a string to be appended to the first -part of the configuration name or a string to be deleted from the -configuration name, if present. The definition should be an initializer -for an array of structures. Each array element should have three -elements: the switch name (a string constant, including the initial -dash), one of the enumeration codes @code{ADD} or @code{DELETE} to -indicate whether the string should be inserted or deleted, and the string -to be inserted or deleted (a string constant). - -For example, on a machine where @samp{64} at the end of the -configuration name denotes a 64-bit target and you want the @option{-32} -and @option{-64} switches to select between 32- and 64-bit targets, you would -code - -@smallexample -#define MODIFY_TARGET_NAME \ - @{ @{ "-32", DELETE, "64"@}, \ - @{"-64", ADD, "64"@}@} -@end smallexample -@end defmac - @defmac SYSTEM_INCLUDE_DIR Define this macro as a C string constant if you wish to specify a system-specific directory to search for header files before the standard diff --git a/gcc/gcc.c b/gcc/gcc.c index 6f846d7f896..23c37be2e7a 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -280,23 +280,6 @@ static const char *cross_compile = "1"; static const char *cross_compile = "0"; #endif -#ifdef MODIFY_TARGET_NAME - -/* Information on how to alter the target name based on a command-line - switch. The only case we support now is simply appending or deleting a - string to or from the end of the first part of the configuration name. */ - -enum add_del {ADD, DELETE}; - -static const struct modify_target -{ - const char *const sw; - const enum add_del add_del; - const char *const str; -} -modify_target[] = MODIFY_TARGET_NAME; -#endif - /* Greatest exit code of sub-processes that has been encountered up to now. */ static int greatest_status = 1; @@ -3509,10 +3492,6 @@ process_command (int argc, const char **argv) const char *spec_lang = 0; int last_language_n_infiles; int lang_n_infiles = 0; -#ifdef MODIFY_TARGET_NAME - int is_modify_target_name; - unsigned int j; -#endif const char *tooldir_prefix; char *(*get_relative_prefix) (const char *, const char *, const char *) = NULL; @@ -4134,43 +4113,6 @@ process_command (int argc, const char **argv) default: normal_switch: -#ifdef MODIFY_TARGET_NAME - is_modify_target_name = 0; - - for (j = 0; j < ARRAY_SIZE (modify_target); j++) - if (! strcmp (argv[i], modify_target[j].sw)) - { - char *new_name = XNEWVEC (char, strlen (modify_target[j].str) - + strlen (spec_machine)); - const char *p, *r; - char *q; - int made_addition = 0; - - is_modify_target_name = 1; - for (p = spec_machine, q = new_name; *p != 0; ) - { - if (modify_target[j].add_del == DELETE - && (! strncmp (q, modify_target[j].str, - strlen (modify_target[j].str)))) - p += strlen (modify_target[j].str); - else if (modify_target[j].add_del == ADD - && ! made_addition && *p == '-') - { - for (r = modify_target[j].str; *r != 0; ) - *q++ = *r++; - made_addition = 1; - } - - *q++ = *p++; - } - - spec_machine = new_name; - } - - if (is_modify_target_name) - break; -#endif - n_switches++; if (SWITCH_TAKES_ARG (c) > (p[1] != 0)) @@ -4311,17 +4253,6 @@ process_command (int argc, const char **argv) for (i = 1; i < argc; i++) { /* Just skip the switches that were handled by the preceding loop. */ -#ifdef MODIFY_TARGET_NAME - is_modify_target_name = 0; - - for (j = 0; j < ARRAY_SIZE (modify_target); j++) - if (! strcmp (argv[i], modify_target[j].sw)) - is_modify_target_name = 1; - - if (is_modify_target_name) - ; - else -#endif if (! strncmp (argv[i], "-Wa,", 4)) ; else if (! strncmp (argv[i], "-Wp,", 4)) diff --git a/gcc/system.h b/gcc/system.h index 38a7c017af0..49f4918aab0 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -769,7 +769,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN; 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 + ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME /* Hooks that are no longer used. */ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \