diff options
| author | Martin Jambor <mjambor@suse.cz> | 2017-06-26 15:27:22 +0200 |
|---|---|---|
| committer | Martin Jambor <mjambor@suse.cz> | 2017-06-26 15:27:22 +0200 |
| commit | 166bec868d991fdf71f9a66f994e5977fcab4aa2 (patch) | |
| tree | 5e45be1a3236377b15a25666d5ad9e0a566aef8a /gcc/gcc.c | |
| parent | 7f6e4303242a526871a02c003eb57257f7b25448 (diff) | |
| parent | e76fa056805f0aeb36583a27b02f4a4adbfd0004 (diff) | |
| download | gcc-166bec868d991fdf71f9a66f994e5977fcab4aa2.tar.gz | |
Merge branch 'master' into gcn
Diffstat (limited to 'gcc/gcc.c')
| -rw-r--r-- | gcc/gcc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/gcc.c b/gcc/gcc.c index 4724276a318..6d724b25423 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1259,9 +1259,9 @@ struct compiler const char *cpp_spec; /* If non-NULL, substitute this spec for `%C', rather than the usual cpp_spec. */ - const int combinable; /* If nonzero, compiler can deal with + int combinable; /* If nonzero, compiler can deal with multiple source files at once (IMA). */ - const int needs_preprocessing; /* If nonzero, source files need to + int needs_preprocessing; /* If nonzero, source files need to be run through a preprocessor. */ }; @@ -9398,7 +9398,8 @@ sanitize_spec_function (int argc, const char **argv) if (strcmp (argv[0], "thread") == 0) return (flag_sanitize & SANITIZE_THREAD) ? "" : NULL; if (strcmp (argv[0], "undefined") == 0) - return ((flag_sanitize & (SANITIZE_UNDEFINED | SANITIZE_NONDEFAULT)) + return ((flag_sanitize + & (SANITIZE_UNDEFINED | SANITIZE_UNDEFINED_NONDEFAULT)) && !flag_sanitize_undefined_trap_on_error) ? "" : NULL; if (strcmp (argv[0], "leak") == 0) return ((flag_sanitize |