diff options
| author | Aldy Hernandez <aldyh@gcc.gnu.org> | 2018-03-22 14:13:03 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2018-03-22 14:13:03 +0000 |
| commit | c6afa748289c1908e38f4cd43673f6b9a654ba79 (patch) | |
| tree | e5cf4a3f81c17e68cd8ffda7996f9062e1106372 /gcc/cppbuiltin.c | |
| parent | 75e06b71300cd907fa4c40f83563bd0151a6d691 (diff) | |
| parent | 1bdbef090299990b1fdef6323bb3daa48acf9349 (diff) | |
| download | gcc-c6afa748289c1908e38f4cd43673f6b9a654ba79.zip gcc-c6afa748289c1908e38f4cd43673f6b9a654ba79.tar.gz gcc-c6afa748289c1908e38f4cd43673f6b9a654ba79.tar.bz2 | |
Merge remote-tracking branch 'origin/trunk' into range-gen3-merge
This merge has not been tested apart from building c/c++ with
--disable-bootstrap.
get_nonzero_bits_as_range() needs to be looked at.
From-SVN: r258769
Diffstat (limited to 'gcc/cppbuiltin.c')
| -rw-r--r-- | gcc/cppbuiltin.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c index 720e231..de8cd33 100644 --- a/gcc/cppbuiltin.c +++ b/gcc/cppbuiltin.c @@ -1,5 +1,5 @@ /* Define builtin-in macros for all front ends that perform preprocessing - Copyright (C) 2010-2017 Free Software Foundation, Inc. + Copyright (C) 2010-2018 Free Software Foundation, Inc. This file is part of GCC. @@ -110,8 +110,6 @@ define_builtin_macros_for_compilation_flags (cpp_reader *pfile) cpp_define_formatted (pfile, "__FINITE_MATH_ONLY__=%d", flag_finite_math_only); - if (flag_cilkplus) - cpp_define (pfile, "__cilk=200"); if (flag_check_pointer_bounds) cpp_define (pfile, "__CHKP__"); |