From patchwork Mon Aug 20 14:18:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 959739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-483976-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P2nKm35x"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vG9z42Lzz9s4v for ; Tue, 21 Aug 2018 00:18:14 +1000 (AEST) Received: (qmail 65153 invoked by alias); 20 Aug 2018 14:18:08 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 64745 invoked by uid 89); 20 Aug 2018 14:18:08 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=stamp, PACKAGE X-HELO: mail-yw1-f45.google.com Received: from mail-yw1-f45.google.com (HELO mail-yw1-f45.google.com) (209.85.161.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Aug 2018 14:18:05 +0000 Received: by mail-yw1-f45.google.com with SMTP id n207-v6so1781674ywn.9 for ; Mon, 20 Aug 2018 07:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=xV84R2PHkfFkol+TEZz3uLgFBxlbOLMDKon+pWlj5+8=; b=P2nKm35xUgk/tcRgFWraP3RFeSBJBEsBFvIrs8mQ2ZXT1GHkdAbHIslyRDCJX91d88 UYgrOTnx28uBP6J2f+8lfK3qkcf/yF8TXofkZJcsQcrfvHH0WSMAm7Tj6eMtNSNzti3A fFpIctAbvU4Yz7n/m+SEI0zGWqNykxBsXh+xMfnxE92gBjd6CS4iyGotDEPsictUe+Fj Y2jZZ4mIdPUHMbiXCMk6nq8UIzZ4kiQPh0XJjX6uurr5P3cfiFZ9Mlm95ITf/BaHUKpM cO1vR908H0rbus/Uq8r2kFkoMOhmLJbdeYiyoG5pgsX5cOj0l6EAFgzkvuw6ZF2ZUWX9 tUVw== Received: from ?IPv6:2620:10d:c0a3:20fb:7500:e7fb:4a6f:2254? ([2620:10d:c091:200::5c29]) by smtp.googlemail.com with ESMTPSA id d70-v6sm2994262ywe.97.2018.08.20.07.18.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Aug 2018 07:18:02 -0700 (PDT) Sender: Nathan Sidwell To: GCC Patches From: Nathan Sidwell Subject: [PATCH] Kill cpp-id-data.h Message-ID: Date: Mon, 20 Aug 2018 10:18:01 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Now that cpp-id-data.h contains a single #include, we can kill it and have its includers simply point at the sub include. That turns out to be a single file. Except of course, the makefile & gty pieces that also need updates, but mechanical ones. booted & tested on x86_64-linux, committing to trunk. nathan 2018-08-20 Nathan Sidwell 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 Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in (revision 263658) +++ gcc/Makefile.in (working copy) @@ -978,8 +978,7 @@ CPPLIB_H = $(srcdir)/../libcpp/include/l INPUT_H = $(srcdir)/../libcpp/include/line-map.h input.h OPTS_H = $(INPUT_H) $(VEC_H) opts.h $(OBSTACK_H) SYMTAB_H = $(srcdir)/../libcpp/include/symtab.h $(OBSTACK_H) -CPP_ID_DATA_H = $(CPPLIB_H) $(srcdir)/../libcpp/include/cpp-id-data.h -CPP_INTERNAL_H = $(srcdir)/../libcpp/internal.h $(CPP_ID_DATA_H) +CPP_INTERNAL_H = $(srcdir)/../libcpp/internal.h TREE_DUMP_H = tree-dump.h $(SPLAY_TREE_H) $(DUMPFILE_H) TREE_PASS_H = tree-pass.h $(TIMEVAR_H) $(DUMPFILE_H) TREE_SSA_H = tree-ssa.h tree-ssa-operands.h \ @@ -2522,7 +2521,7 @@ s-match: build/genmatch$(build_exeext) $ generic-match.c $(STAMP) s-match -GTFILES = $(CPP_ID_DATA_H) $(srcdir)/input.h $(srcdir)/coretypes.h \ +GTFILES = $(CPPLIB_H) $(srcdir)/input.h $(srcdir)/coretypes.h \ $(host_xm_file_list) \ $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \ $(srcdir)/wide-int.h $(srcdir)/alias.h \ Index: gcc/gengtype.c =================================================================== --- gcc/gengtype.c (revision 263658) +++ gcc/gengtype.c (working copy) @@ -1721,7 +1721,7 @@ open_base_files (void) "tree-vrp.h", "tree-phinodes.h", "ssa-iterators.h", "stringpool.h", "tree-ssanames.h", "tree-ssa-loop.h", "tree-ssa-loop-ivopts.h", "tree-ssa-loop-manip.h", "tree-ssa-loop-niter.h", "tree-into-ssa.h", - "tree-dfa.h", "tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h", + "tree-dfa.h", "tree-ssa.h", "reload.h", "cpplib.h", "tree-chrec.h", "except.h", "output.h", "cfgloop.h", "target.h", "lto-streamer.h", "target-globals.h", "ipa-ref.h", "cgraph.h", "symbol-summary.h", "ipa-prop.h", "ipa-fnsummary.h", "dwarf2out.h", "omp-offload.h", NULL Index: libcpp/Makefile.in =================================================================== --- libcpp/Makefile.in (revision 263658) +++ libcpp/Makefile.in (working copy) @@ -261,9 +261,8 @@ po/$(PACKAGE).pot: $(libcpp_a_SOURCES) sed 's:$(srcdir)/::g' 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) Index: libcpp/include/cpp-id-data.h =================================================================== --- libcpp/include/cpp-id-data.h (revision 263658) +++ libcpp/include/cpp-id-data.h (working copy) @@ -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 -. */ - -#include "cpplib.h" - Index: libcpp/internal.h =================================================================== --- libcpp/internal.h (revision 263658) +++ libcpp/internal.h (working copy) @@ -23,7 +23,7 @@ along with this program; see the file CO #define LIBCPP_INTERNAL_H #include "symtab.h" -#include "cpp-id-data.h" +#include "cpplib.h" #if HAVE_ICONV #include