diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-10-31 15:26:28 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-10-31 15:26:28 +0000 |
| commit | f3f6029db2e5f960c10062d8c8c74d766fcad6d2 (patch) | |
| tree | 65fe76f5ca430fb5055b03a24045e1d61e3668be /gcc | |
| parent | 82a14443dbad05cdf1bd09c7ebc98c406c81e384 (diff) | |
| download | gcc-f3f6029db2e5f960c10062d8c8c74d766fcad6d2.zip gcc-f3f6029db2e5f960c10062d8c8c74d766fcad6d2.tar.gz gcc-f3f6029db2e5f960c10062d8c8c74d766fcad6d2.tar.bz2 | |
[6/6] Preprocessor forced macro location
https://gcc.gnu.org/ml/gcc-patches/2018-10/msg02044.html
libcpp/
* internal.h (struct cpp_reader): Rename forced_token_location_p
to forced_token_location and drop its pointerness.
* include/cpplib.h (cpp_force_token_locations): Take location, not
pointer to one.
* init.c (cpp_create_reader): Adjust.
* lex.c (cpp_read_main_file):
gcc/c-family/
* c-opts.c (c_finish_options): Adjust cpp_force_token_locations call.
gcc/fortran/
* cpp.c (gfc_cpp_init): Adjust cpp_force_token_locations call.
From-SVN: r265692
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-opts.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/cpp.c | 3 |
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); |