diff options
| author | Nathan Sidwell <nathan@acm.org> | 2018-08-20 14:20:04 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2018-08-20 14:20:04 +0000 |
| commit | abcd1775e067600918da69330f8ff3f1f6734b4c (patch) | |
| tree | ecd0afb0d6987e07b9ccde4522a227e6a3b998a0 /libcpp | |
| parent | 4864297f7858617a5fe406d3651a46446b41db7a (diff) | |
| download | gcc-abcd1775e067600918da69330f8ff3f1f6734b4c.tar.gz | |
[PATCH] Kill cpp-id-data.h
https://gcc.gnu.org/ml/gcc-patches/2018-08/msg01149.html
libcpp/
* Makefile.in (TAGS_SOURCES): Remove cpp-id-data.h.
* include/cpp-id-data.h: Delete.
* internal.h: Include cpplib.h not cpp-id-data.h.
gcc/
* Makefile.in (CPP_ID_DATA_H): Delete.
(CPP_INTERNAL_H): Don't add it.
(GTFILES): Replace CPP_ID_DATA_H with CPPLIB_H.
* gengtype.c (open_base_files): Replace cpp-id-data.h with cpplib.h
From-SVN: r263663
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpp/Makefile.in | 5 | ||||
| -rw-r--r-- | libcpp/include/cpp-id-data.h | 19 | ||||
| -rw-r--r-- | libcpp/internal.h | 2 |
4 files changed, 7 insertions, 23 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 2e347db4556..19d89b17227 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,5 +1,9 @@ 2018-08-20 Nathan Sidwell <nathan@acm.org> + * Makefile.in (TAGS_SOURCES): Remove cpp-id-data.h. + * include/cpp-id-data.h: Delete. + * internal.h: Include cpplib.h not cpp-id-data.h. + * include/cpp-id-data.h (struct answer): Delete. * include/cpplib.h (struct answer): Don't forward-declare. (enum cpp_macro_kind): Add cmk_assert. diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in index bfd6069c250..835c835183f 100644 --- a/libcpp/Makefile.in +++ b/libcpp/Makefile.in @@ -261,9 +261,8 @@ po/$(PACKAGE).pot: $(libcpp_a_SOURCES) sed 's:$(srcdir)/::g' <po/$(PACKAGE).pot.tmp >po/$(PACKAGE).pot rm po/$(PACKAGE).pot.tmp -TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h ucnid.h \ - include/line-map.h include/symtab.h include/cpp-id-data.h \ - include/cpplib.h include/mkdeps.h system.h +TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h system.h ucnid.h \ + include/cpplib.h include/line-map.h include/mkdeps.h include/symtab.h TAGS: $(TAGS_SOURCES) cd $(srcdir) && etags $(TAGS_SOURCES) diff --git a/libcpp/include/cpp-id-data.h b/libcpp/include/cpp-id-data.h deleted file mode 100644 index 909f8286a09..00000000000 --- a/libcpp/include/cpp-id-data.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Structures that hang off cpp_identifier, for PCH. - Copyright (C) 1986-2018 Free Software Foundation, Inc. - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING3. If not see -<http://www.gnu.org/licenses/>. */ - -#include "cpplib.h" - diff --git a/libcpp/internal.h b/libcpp/internal.h index e40b20f267c..59f830c6a8e 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -23,7 +23,7 @@ along with this program; see the file COPYING3. If not see #define LIBCPP_INTERNAL_H #include "symtab.h" -#include "cpp-id-data.h" +#include "cpplib.h" #if HAVE_ICONV #include <iconv.h> |