aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-opts.c3
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/cpp.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 5b96582..290e3fa 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-31 Nathan Sidwell <nathan@acm.org>
+
+ * c-opts.c (c_finish_options): Adjust cpp_force_token_locations call.
+
2018-10-30 Martin Sebor <msebor@redhat.com>
PR middle-end/87041
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 9cf1900..4592682 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1396,8 +1396,7 @@ c_finish_options (void)
0)));
/* Make sure all of the builtins about to be declared have
BUILTINS_LOCATION has their source_location. */
- source_location builtins_loc = BUILTINS_LOCATION;
- cpp_force_token_locations (parse_in, &builtins_loc);
+ cpp_force_token_locations (parse_in, BUILTINS_LOCATION);
cpp_init_builtins (parse_in, flag_hosted);
c_cpp_builtins (parse_in);
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e6e350d..a773bbd 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-31 Nathan Sidwell <nathan@acm.org>
+
+ * cpp.c (gfc_cpp_init): Adjust cpp_force_token_locations call.
+
2018-10-31 Martin Liska <mliska@suse.cz>
* trans-decl.c (struct module_hasher): Call htab_hash_string
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 3091eeb..a28421f 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -579,8 +579,7 @@ gfc_cpp_init (void)
{
/* Make sure all of the builtins about to be declared have
BUILTINS_LOCATION has their source_location. */
- source_location builtins_loc = BUILTINS_LOCATION;
- cpp_force_token_locations (cpp_in, &builtins_loc);
+ cpp_force_token_locations (cpp_in, BUILTINS_LOCATION);
cpp_define_builtins (cpp_in);