aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2012-04-30 11:43:43 +0000
committerDodji Seketeli <dodji@gcc.gnu.org>2012-04-30 13:43:43 +0200
commit51fce2d3968d485cc72fb22740e82d0c31ce9ae9 (patch)
treefbed8c17b298f0df7dcae081b3c843995b665292
parentdde9c193ebf5d1a84e2d8609226de2a5dbb72309 (diff)
downloadgcc-51fce2d3968d485cc72fb22740e82d0c31ce9ae9.zip
gcc-51fce2d3968d485cc72fb22740e82d0c31ce9ae9.tar.gz
gcc-51fce2d3968d485cc72fb22740e82d0c31ce9ae9.tar.bz2
Switch -ftrack-macro-expansion=2 on by default.
This switches the compiler to -ftrack-macro-expansion=2 by default. Tested and bootstrapped on x86_64-unknown-linux-gnu against trunk. libcpp/ * init.c (cpp_create_reader): Switch -ftrack-macro-expansion=2 on by default. Add comments. gcc/docs/ * cppopts.texi: Adjust for enabling -ftrack-macro-expansion=2 by default. From-SVN: r186977
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/doc/cppopts.texi2
-rw-r--r--libcpp/ChangeLog4
-rw-r--r--libcpp/init.c6
4 files changed, 16 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c47ba21..43d3f5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2012-04-30 Dodji Seketeli <dodji@redhat.com>
+ Switch -ftrack-macro-expansion=2 on by default.
+ * docs/cppopts.texi: Adjust for enabling -ftrack-macro-expansion=2
+ by default.
+
Fix va_start related location
* builtins.c (fold_builtin_next_arg): Unwinds to the first
location in real source code.
diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
index 205d870..27b1095 100644
--- a/gcc/doc/cppopts.texi
+++ b/gcc/doc/cppopts.texi
@@ -617,6 +617,8 @@ tokens locations completely. This value is the most memory hungry.
When this option is given no argument, the default parameter value is
@samp{2}.
+Note that -ftrack-macro-expansion=2 is activated by default.
+
@item -fexec-charset=@var{charset}
@opindex fexec-charset
@cindex character set, execution
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 2c05214..271148c 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,9 @@
2012-04-30 Dodji Seketeli <dodji@redhat.com>
+ Switch -ftrack-macro-expansion=2 on by default.
+ * init.c (cpp_create_reader): Switch -ftrack-macro-expansion=2 on
+ by default. Add comments.
+
Strip "<built-in>" loc from displayed expansion context
* include/line-map.h (linemap_unwind_toward_expansion): Fix typo
in comment.
diff --git a/libcpp/init.c b/libcpp/init.c
index 3262184..7752fea 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -174,6 +174,12 @@ cpp_create_reader (enum c_lang lang, hash_table *table,
CPP_OPTION (pfile, warn_dollars) = 1;
CPP_OPTION (pfile, warn_variadic_macros) = 1;
CPP_OPTION (pfile, warn_builtin_macro_redefined) = 1;
+ /* By default, track locations of tokens resulting from macro
+ expansion. The '2' means, track the locations with the highest
+ accuracy. Read the comments for struct
+ cpp_options::track_macro_expansion to learn about the other
+ values. */
+ CPP_OPTION (pfile, track_macro_expansion) = 2;
CPP_OPTION (pfile, warn_normalize) = normalized_C;
CPP_OPTION (pfile, warn_literal_suffix) = 1;