projects
/
platform
/
upstream
/
gcc48.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 4.8.1
[platform/upstream/gcc48.git]
/
fixincludes
/
fixincl.c
diff --git
a/fixincludes/fixincl.c
b/fixincludes/fixincl.c
index
9f399ab
..
5a113c6
100644
(file)
--- a/
fixincludes/fixincl.c
+++ b/
fixincludes/fixincl.c
@@
-2,7
+2,7
@@
files which are fixed to work correctly with ANSI C and placed in a
directory that GCC will search.
files which are fixed to work correctly with ANSI C and placed in a
directory that GCC will search.
- Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009
+ Copyright (C) 1997, 1998, 1999, 2000, 2004, 2009
, 2012
Free Software Foundation, Inc.
This file is part of GCC.
Free Software Foundation, Inc.
This file is part of GCC.
@@
-53,22
+53,8
@@
static const char z_std_preamble[] =
original, manufacturer supplied header file. */\n\n";
int find_base_len = 0;
original, manufacturer supplied header file. */\n\n";
int find_base_len = 0;
-
-typedef enum {
- VERB_SILENT = 0,
- VERB_FIXES,
- VERB_APPLIES,
- VERB_PROGRESS,
- VERB_TESTS,
- VERB_EVERYTHING
-} te_verbose;
-
-te_verbose verbose_level = VERB_PROGRESS;
int have_tty = 0;
int have_tty = 0;
-#define VLEVEL(l) ((unsigned int) verbose_level >= (unsigned int) l)
-#define NOT_SILENT VLEVEL(VERB_FIXES)
-
pid_t process_chain_head = (pid_t) -1;
char* pz_curr_file; /* name of the current file under test/fix */
pid_t process_chain_head = (pid_t) -1;
char* pz_curr_file; /* name of the current file under test/fix */
@@
-412,8
+398,17
@@
run_compiles (void)
/* FOR every fixup, ... */
do
{
/* FOR every fixup, ... */
do
{
- tTestDesc *p_test = p_fixd->p_test_desc;
- int test_ct = p_fixd->test_ct;
+ tTestDesc *p_test;
+ int test_ct;
+
+ if (fixinc_mode && (p_fixd->fd_flags & FD_REPLACEMENT))
+ {
+ p_fixd->fd_flags |= FD_SKIP_TEST;
+ continue;
+ }
+
+ p_test = p_fixd->p_test_desc;
+ test_ct = p_fixd->test_ct;
/* IF the machine type pointer is not NULL (we are not in test mode)
AND this test is for or not done on particular machines
/* IF the machine type pointer is not NULL (we are not in test mode)
AND this test is for or not done on particular machines
@@
-829,7
+824,7
@@
fix_with_system (tFixDesc* p_fixd,
/*
* Now add the fix number and file names that may be needed
*/
/*
* Now add the fix number and file names that may be needed
*/
- sprintf (pz_scan, " %ld '%s' '%s'
",
(long) (p_fixd - fixDescList),
+ sprintf (pz_scan, " %ld '%s' '%s'
'%s'",
(long) (p_fixd - fixDescList),
pz_fix_file, pz_file_source, pz_temp_file);
}
else /* NOT an "internal" fix: */
pz_fix_file, pz_file_source, pz_temp_file);
}
else /* NOT an "internal" fix: */