Commit 9218435e by Kazu Hirata Committed by Jeff Law

* gcc.c: Fix formatting.

From-SVN: r36050
parent fba0bfd4
2000-08-29 Kazu Hirata <kazu@hxi.com>
* gcc.c: Fix formatting.
2000-08-29 Zack Weinberg <zack@wolery.cumb.org> 2000-08-29 Zack Weinberg <zack@wolery.cumb.org>
* flags.h (time_report, mem_report): New global flags. * flags.h (time_report, mem_report): New global flags.
......
...@@ -32,7 +32,6 @@ CC recognizes how to compile each input file by suffixes in the file names. ...@@ -32,7 +32,6 @@ CC recognizes how to compile each input file by suffixes in the file names.
Once it knows which kind of compilation to perform, the procedure for Once it knows which kind of compilation to perform, the procedure for
compilation is specified by a string called a "spec". */ compilation is specified by a string called a "spec". */
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
#include <signal.h> #include <signal.h>
...@@ -636,7 +635,6 @@ static struct user_specs *user_specs_head, *user_specs_tail; ...@@ -636,7 +635,6 @@ static struct user_specs *user_specs_head, *user_specs_tail;
#define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR) #define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR)
#endif #endif
#ifdef HAVE_EXECUTABLE_SUFFIX #ifdef HAVE_EXECUTABLE_SUFFIX
/* This defines which switches stop a full compilation. */ /* This defines which switches stop a full compilation. */
#define DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR) \ #define DEFAULT_SWITCH_CURTAILS_COMPILATION(CHAR) \
...@@ -1060,7 +1058,7 @@ struct spec_list ...@@ -1060,7 +1058,7 @@ struct spec_list
}; };
#define INIT_STATIC_SPEC(NAME,PTR) \ #define INIT_STATIC_SPEC(NAME,PTR) \
{ NAME, NULL_PTR, PTR, (struct spec_list *)0, sizeof (NAME)-1, 0 } { NAME, NULL_PTR, PTR, (struct spec_list *) 0, sizeof (NAME)-1, 0 }
/* List of statically defined specs. */ /* List of statically defined specs. */
static struct spec_list static_specs[] = static struct spec_list static_specs[] =
...@@ -1103,21 +1101,20 @@ struct spec_list_1 ...@@ -1103,21 +1101,20 @@ struct spec_list_1
}; };
static struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS }; static struct spec_list_1 extra_specs_1[] = { EXTRA_SPECS };
static struct spec_list * extra_specs = (struct spec_list *)0; static struct spec_list * extra_specs = (struct spec_list *) 0;
#endif #endif
/* List of dynamically allocates specs that have been defined so far. */ /* List of dynamically allocates specs that have been defined so far. */
static struct spec_list *specs = (struct spec_list *)0; static struct spec_list *specs = (struct spec_list *) 0;
/* Initialize the specs lookup routines. */ /* Initialize the specs lookup routines. */
static void static void
init_spec () init_spec ()
{ {
struct spec_list *next = (struct spec_list *)0; struct spec_list *next = (struct spec_list *) 0;
struct spec_list *sl = (struct spec_list *)0; struct spec_list *sl = (struct spec_list *) 0;
int i; int i;
if (specs) if (specs)
...@@ -1152,7 +1149,6 @@ init_spec () ...@@ -1152,7 +1149,6 @@ init_spec ()
specs = sl; specs = sl;
} }
/* Change the value of spec NAME to SPEC. If SPEC is empty, then the spec is /* Change the value of spec NAME to SPEC. If SPEC is empty, then the spec is
removed; If the spec starts with a + then SPEC is added to the end of the removed; If the spec starts with a + then SPEC is added to the end of the
current spec. */ current spec. */
...@@ -1170,7 +1166,7 @@ set_spec (name, spec) ...@@ -1170,7 +1166,7 @@ set_spec (name, spec)
/* If this is the first call, initialize the statically allocated specs. */ /* If this is the first call, initialize the statically allocated specs. */
if (!specs) if (!specs)
{ {
struct spec_list *next = (struct spec_list *)0; struct spec_list *next = (struct spec_list *) 0;
for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--) for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
{ {
sl = &static_specs[i]; sl = &static_specs[i];
...@@ -1534,12 +1530,12 @@ read_specs (filename, main_p) ...@@ -1534,12 +1530,12 @@ read_specs (filename, main_p)
while (*p1 == ' ' || *p1 == '\t') while (*p1 == ' ' || *p1 == '\t')
p1++; p1++;
if (! ISALPHA ((unsigned char)*p1)) if (! ISALPHA ((unsigned char) *p1))
fatal ("specs %%rename syntax malformed after %ld characters", fatal ("specs %%rename syntax malformed after %ld characters",
(long) (p1 - buffer)); (long) (p1 - buffer));
p2 = p1; p2 = p1;
while (*p2 && !ISSPACE ((unsigned char)*p2)) while (*p2 && !ISSPACE ((unsigned char) *p2))
p2++; p2++;
if (*p2 != ' ' && *p2 != '\t') if (*p2 != ' ' && *p2 != '\t')
...@@ -1551,13 +1547,13 @@ read_specs (filename, main_p) ...@@ -1551,13 +1547,13 @@ read_specs (filename, main_p)
while (*p2 == ' ' || *p2 == '\t') while (*p2 == ' ' || *p2 == '\t')
p2++; p2++;
if (! ISALPHA ((unsigned char)*p2)) if (! ISALPHA ((unsigned char) *p2))
fatal ("specs %%rename syntax malformed after %ld characters", fatal ("specs %%rename syntax malformed after %ld characters",
(long) (p2 - buffer)); (long) (p2 - buffer));
/* Get new spec name */ /* Get new spec name */
p3 = p2; p3 = p2;
while (*p3 && !ISSPACE ((unsigned char)*p3)) while (*p3 && !ISSPACE ((unsigned char) *p3))
p3++; p3++;
if (p3 != p-1) if (p3 != p-1)
...@@ -2122,7 +2118,7 @@ make_relative_prefix (progname, bin_prefix, prefix) ...@@ -2122,7 +2118,7 @@ make_relative_prefix (progname, bin_prefix, prefix)
std_loc_p = 1; std_loc_p = 1;
free_split_directories (prog_dirs); free_split_directories (prog_dirs);
free_split_directories (bin_dirs); free_split_directories (bin_dirs);
prog_dirs = bin_dirs = (char **)0; prog_dirs = bin_dirs = (char **) 0;
return NULL_PTR; return NULL_PTR;
} }
} }
...@@ -2419,7 +2415,6 @@ unused_prefix_warnings (pprefix) ...@@ -2419,7 +2415,6 @@ unused_prefix_warnings (pprefix)
} }
} }
/* Execute the command specified by the arguments on the current line of spec. /* Execute the command specified by the arguments on the current line of spec.
When using pipes, this includes several piped-together commands When using pipes, this includes several piped-together commands
with `|' between them. with `|' between them.
...@@ -2688,7 +2683,6 @@ static int warn_std; ...@@ -2688,7 +2683,6 @@ static int warn_std;
/* Gives value to pass as "warn" to add_prefix for standard prefixes. */ /* Gives value to pass as "warn" to add_prefix for standard prefixes. */
static int *warn_std_ptr = 0; static int *warn_std_ptr = 0;
#if defined(HAVE_OBJECT_SUFFIX) || defined(HAVE_EXECUTABLE_SUFFIX) #if defined(HAVE_OBJECT_SUFFIX) || defined(HAVE_EXECUTABLE_SUFFIX)
/* Convert NAME to a new name if it is the standard suffix. DO_EXE /* Convert NAME to a new name if it is the standard suffix. DO_EXE
...@@ -3155,7 +3149,7 @@ process_command (argc, argv) ...@@ -3155,7 +3149,7 @@ process_command (argc, argv)
if (++i >= argc) if (++i >= argc)
fatal ("argument to `-specs' is missing"); fatal ("argument to `-specs' is missing");
user->next = (struct user_specs *)0; user->next = (struct user_specs *) 0;
user->filename = argv[i]; user->filename = argv[i];
if (user_specs_tail) if (user_specs_tail)
user_specs_tail->next = user; user_specs_tail->next = user;
...@@ -3170,7 +3164,7 @@ process_command (argc, argv) ...@@ -3170,7 +3164,7 @@ process_command (argc, argv)
if (strlen (argv[i]) == 7) if (strlen (argv[i]) == 7)
fatal ("argument to `-specs=' is missing"); fatal ("argument to `-specs=' is missing");
user->next = (struct user_specs *)0; user->next = (struct user_specs *) 0;
user->filename = argv[i]+7; user->filename = argv[i]+7;
if (user_specs_tail) if (user_specs_tail)
user_specs_tail->next = user; user_specs_tail->next = user;
...@@ -3427,7 +3421,6 @@ process_command (argc, argv) ...@@ -3427,7 +3421,6 @@ process_command (argc, argv)
/* More prefixes are enabled in main, after we read the specs file /* More prefixes are enabled in main, after we read the specs file
and determine whether this is cross-compilation or not. */ and determine whether this is cross-compilation or not. */
/* Then create the space for the vectors and scan again. */ /* Then create the space for the vectors and scan again. */
switches = ((struct switchstr *) switches = ((struct switchstr *)
...@@ -4005,14 +3998,14 @@ do_spec_1 (spec, inswitch, soft_matched_part) ...@@ -4005,14 +3998,14 @@ do_spec_1 (spec, inswitch, soft_matched_part)
const char *suffix = p; const char *suffix = p;
char *saved_suffix = NULL; char *saved_suffix = NULL;
while (*p == '.' || ISALPHA ((unsigned char)*p)) while (*p == '.' || ISALPHA ((unsigned char) *p))
p++; p++;
suffix_length = p - suffix; suffix_length = p - suffix;
if (p[0] == '%' && p[1] == 'O') if (p[0] == '%' && p[1] == 'O')
{ {
p += 2; p += 2;
/* We don't support extra suffix characters after %O. */ /* We don't support extra suffix characters after %O. */
if (*p == '.' || ISALPHA ((unsigned char)*p)) if (*p == '.' || ISALPHA ((unsigned char) *p))
abort (); abort ();
if (suffix_length == 0) if (suffix_length == 0)
suffix = OBJECT_SUFFIX; suffix = OBJECT_SUFFIX;
...@@ -4307,7 +4300,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) ...@@ -4307,7 +4300,7 @@ do_spec_1 (spec, inswitch, soft_matched_part)
if (*y != '_' if (*y != '_'
|| (*(y+1) != '_' || (*(y+1) != '_'
&& ! ISUPPER ((unsigned char)*(y+1)))) && ! ISUPPER ((unsigned char) *(y+1))))
{ {
/* Stick __ at front of macro name. */ /* Stick __ at front of macro name. */
if (*y != '_') if (*y != '_')
...@@ -4355,7 +4348,7 @@ do_spec_1 (spec, inswitch, soft_matched_part) ...@@ -4355,7 +4348,7 @@ do_spec_1 (spec, inswitch, soft_matched_part)
if (*y != '_' if (*y != '_'
|| (*(y+1) != '_' || (*(y+1) != '_'
&& ! ISUPPER ((unsigned char)*(y+1)))) && ! ISUPPER ((unsigned char) *(y+1))))
{ {
/* Stick -D__ at front of macro name. */ /* Stick -D__ at front of macro name. */
*x++ = '-'; *x++ = '-';
...@@ -5782,7 +5775,6 @@ notice VPARAMS ((const char *msgid, ...)) ...@@ -5782,7 +5775,6 @@ notice VPARAMS ((const char *msgid, ...))
va_end (ap); va_end (ap);
} }
static void static void
validate_all_switches () validate_all_switches ()
{ {
...@@ -5938,7 +5930,7 @@ used_arg (p, len) ...@@ -5938,7 +5930,7 @@ used_arg (p, len)
{ {
mswitches[n_mswitches].str = matches[j].replace; mswitches[n_mswitches].str = matches[j].replace;
mswitches[n_mswitches].len = matches[j].rep_len; mswitches[n_mswitches].len = matches[j].rep_len;
mswitches[n_mswitches].replace = (char *)0; mswitches[n_mswitches].replace = (char *) 0;
mswitches[n_mswitches].rep_len = 0; mswitches[n_mswitches].rep_len = 0;
n_mswitches++; n_mswitches++;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment