From patchwork Sat Jul 8 13:41:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 107229 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1284057qge; Sat, 8 Jul 2017 06:42:03 -0700 (PDT) X-Received: by 10.99.16.65 with SMTP id 1mr6177924pgq.208.1499521323734; Sat, 08 Jul 2017 06:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499521323; cv=none; d=google.com; s=arc-20160816; b=x0oWGrknhdA8O+41XPnsxvg6PXCGhXRCqEzR6U0t1UuUjNynOrHY0YKd8gHLg1peYu G6u5Ee6Sq6GfT98hqNt5g8rYwC8oMYmjJc6sdrza18XVSe5Yl+DCRTaUo+mm2RvIO0JK DuVti1suYeiOQ/bqtvU7j3QvkQfNAf5qEhYc+tZErOCLz6tGZXHeOBSQzBXEtaLDAk4F UlYnC8fhX53GVc84qrbgtefGgj8b7mYVL0wZgdgnll2swl1w3rLJWA8IbDf67CWGmvfe WoRU0Db2hkQg8wssgFzBo7GtnT4lfGfy+humV9FEbQjFy6/mLEaw+qsqlTTF7CHev2Vk zxPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:message-id:date:subject:mail-followup-to:to :from:delivered-to:sender:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=LfGmLMEGitR/DbH8mGB9Yfzhvy+FXeuDs384HhbzVRQ=; b=qgH3KT5bgj/Ok21wodw5EtGQN31ySKQdpohQo5XGaZlRVHc+zATy3Ih42YbP5kzK9r mBUVVv7nMSIujBkcjYEJNrNutEfsGy4WaQYsGYceobOlQ2T4qRiUCJbrnfGcGw7oPF2L jg8aE7dfv/y4rfAoEFT5rPuwZ0TgRDQLAhwiH3qDLWJoqPp4/hKct03EcSyjgYwKbIKj eVUGOZfCm0y2y3tMNjAQhGe8lymA4ojFEJvxHPJQW5aGkGPJZhnLmYqVK7lRUn70Kbue 2DkrG6HrwbwNcT7QOyNzL4qdMHfcX3AeeXMqZJciBvdpnOU0BFeM+Di02gmVUMdjiO+m grUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.b=PSx0TsHl; spf=pass (google.com: domain of gcc-patches-return-457758-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-457758-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id l14si4785691pli.236.2017.07.08.06.42.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jul 2017 06:42:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-457758-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.b=PSx0TsHl; spf=pass (google.com: domain of gcc-patches-return-457758-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-457758-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=Zqeo9215GYidk3anBjd2ehKh2qHsJ9WbsSMVcKdHySBT5WyQ2s75X s0yMwvL4YylcDoWVbDzNCZAETI2qY9R7r7Hr4/stUX1f+/REzDfrv/24bDATg9de 7ItIZ4eHXPUyR944e4l7iSHoHVkX2LR+rY/U1EO0sPh8zlIjh9Et8w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=lndBNcL/ltI87eHSycJirDIdB1c=; b=PSx0TsHlRcrnRklW9KRy UwC//hS2k5BXv9DPmoSnzCjm8chyTY+/54d9HoPTvam/SgbQ4R74aftOsZ+XWR7j 9CqTzRCUTPp+epMucErp3iG9U7mA9L5asXIrz1NOhon1Y/kEfbEMZPI3sE0cWDXE OfOnQhJO7yViQCs3cNlt77s= Received: (qmail 76132 invoked by alias); 8 Jul 2017 13:41:51 -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 76109 invoked by uid 89); 8 Jul 2017 13:41:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-wr0-f174.google.com Received: from mail-wr0-f174.google.com (HELO mail-wr0-f174.google.com) (209.85.128.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 08 Jul 2017 13:41:48 +0000 Received: by mail-wr0-f174.google.com with SMTP id r103so81538682wrb.0 for ; Sat, 08 Jul 2017 06:41:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:mail-followup-to:subject:date:message-id :user-agent:mime-version; bh=LfGmLMEGitR/DbH8mGB9Yfzhvy+FXeuDs384HhbzVRQ=; b=GSk3d6t+r7FknFvWTxVwyV6eSXaQA41pSVVk4yPsKm15npxkQue396DPqvrohHY3XX Iy5VrAaQVBq3pzBoKHHnJdrQJo82uvH6s2OvQAeh7ypasOAizAYyx03JJgsW9EMmWSFq KND0itIMm/pCqPZBsgLwj6d/w4NwPsoh52Jmx+ixmENDioG70S5pM+DXz3SBr5VCFPJV nnbvifR0rTPDjxrV/HSId4HOq/AS0Dm4GTtqPZ70ttkO5GmkT/wE37kLY5982KAmMns0 gM1Kw/LamgfZ7VOofKZIVshXqNMxbu+SMqL6jOYtl7QLY5TpJbmfT113GUrJl2esNhcQ UyQg== X-Gm-Message-State: AIVw113urcGzv+pHoJH1vkmy63x9MX5gy75oB5kejX2WWu0kHVB819Km rwcsM77ImvS9R0lseiz2Ug== X-Received: by 10.223.166.2 with SMTP id k2mr3385981wrc.34.1499521306106; Sat, 08 Jul 2017 06:41:46 -0700 (PDT) Received: from localhost ([2.26.27.176]) by smtp.gmail.com with ESMTPSA id l46sm5234526wrl.15.2017.07.08.06.41.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Jul 2017 06:41:45 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org Subject: [committed] Fix build/min-insn-modes.o rule Date: Sat, 08 Jul 2017 14:41:44 +0100 Message-ID: <878tjzavvr.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Jeff pointed out privately that r249881 left build/min-insn-modes.o with no dependence on insn-modes.h, which could cause a build failure in highly-parallel builds. Fixed with the patch below. I also cleaned up some uses of machmode.h and double-int.h that have been out-of-date for a while; these are now always included via coretypes.h. Tested on x86_64-linux-gnu with "make -j" and applied as obvious. Sorry for the breakage. Richard 2017-07-08 Richard Sandiford gcc/ * Makefile.in (HOOKS_H, RTL_BASE_H, FUNCTION_H, EXPR_H, REGS_H) (REAL_H): Remove $(MACHMODE_H). (FIXED_VALUE_H, TREE_CORE_H, CFGLOOP_H): Remove $(MACHMODE_H) and double-int.h. (CORETYPES_H): Add signop.h, wide-int.h, wide-int-print.h, $(MACHMODE_H) and double-int.h. (build/min-insn-modes.o): Depend on $(CORETYPES_H) rather than $(MACHMODE_H). (gengtype-state.o, gengtype.o, build/gengtype.o): Don't depend on double-int.h. Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in 2017-07-08 14:29:25.647809196 +0100 +++ gcc/Makefile.in 2017-07-08 14:35:26.647087596 +0100 @@ -901,17 +901,18 @@ TARGET_H = $(TM_H) target.h $(TARGET_DEF C_TARGET_H = c-family/c-target.h $(C_TARGET_DEF) COMMON_TARGET_H = common/common-target.h $(INPUT_H) $(COMMON_TARGET_DEF) MACHMODE_H = machmode.h mode-classes.def -HOOKS_H = hooks.h $(MACHMODE_H) +HOOKS_H = hooks.h HOSTHOOKS_DEF_H = hosthooks-def.h $(HOOKS_H) LANGHOOKS_DEF_H = langhooks-def.h $(HOOKS_H) TARGET_DEF_H = target-def.h target-hooks-def.h $(HOOKS_H) targhooks.h C_TARGET_DEF_H = c-family/c-target-def.h c-family/c-target-hooks-def.h \ $(TREE_H) $(C_COMMON_H) $(HOOKS_H) common/common-targhooks.h -CORETYPES_H = coretypes.h insn-modes.h insn-modes-inline.h -RTL_BASE_H = $(CORETYPES_H) rtl.h rtl.def $(MACHMODE_H) reg-notes.def \ +CORETYPES_H = coretypes.h insn-modes.h signop.h wide-int.h wide-int-print.h \ + insn-modes-inline.h $(MACHMODE_H) double-int.h +RTL_BASE_H = $(CORETYPES_H) rtl.h rtl.def reg-notes.def \ insn-notes.def $(INPUT_H) $(REAL_H) statistics.h $(VEC_H) \ $(FIXED_VALUE_H) alias.h $(HASHTAB_H) -FIXED_VALUE_H = fixed-value.h $(MACHMODE_H) double-int.h +FIXED_VALUE_H = fixed-value.h RTL_H = $(RTL_BASE_H) $(FLAGS_H) genrtl.h READ_MD_H = $(OBSTACK_H) $(HASHTAB_H) read-md.h PARAMS_H = params.h params-enum.h params.def @@ -921,10 +922,10 @@ BUILTINS_DEF = builtins.def sync-builtin INTERNAL_FN_DEF = internal-fn.def INTERNAL_FN_H = internal-fn.h $(INTERNAL_FN_DEF) TREE_CORE_H = tree-core.h $(CORETYPES_H) all-tree.def tree.def \ - c-family/c-common.def $(lang_tree_files) $(MACHMODE_H) \ + c-family/c-common.def $(lang_tree_files) \ $(BUILTINS_DEF) $(INPUT_H) statistics.h \ $(VEC_H) treestruct.def $(HASHTAB_H) \ - double-int.h alias.h $(SYMTAB_H) $(FLAGS_H) \ + alias.h $(SYMTAB_H) $(FLAGS_H) \ $(REAL_H) $(FIXED_VALUE_H) TREE_H = tree.h $(TREE_CORE_H) tree-check.h REGSET_H = regset.h $(BITMAP_H) hard-reg-set.h @@ -939,12 +940,12 @@ EMIT_RTL_H = emit-rtl.h FLAGS_H = flags.h flag-types.h $(OPTIONS_H) OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA) FUNCTION_H = function.h $(HASHTAB_H) $(TM_H) hard-reg-set.h \ - $(VEC_H) $(INPUT_H) $(MACHMODE_H) -EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H) + $(VEC_H) $(INPUT_H) +EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) \ + $(EMIT_RTL_H) OPTABS_H = optabs.h insn-codes.h insn-opinit.h -REGS_H = regs.h $(MACHMODE_H) hard-reg-set.h -CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) double-int.h \ - $(BITMAP_H) sbitmap.h +REGS_H = regs.h hard-reg-set.h +CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(BITMAP_H) sbitmap.h IPA_UTILS_H = ipa-utils.h $(TREE_H) $(CGRAPH_H) IPA_REFERENCE_H = ipa-reference.h $(BITMAP_H) $(TREE_H) CGRAPH_H = cgraph.h $(VEC_H) $(TREE_H) $(BASIC_BLOCK_H) $(FUNCTION_H) \ @@ -985,7 +986,7 @@ DIAGNOSTIC_H = diagnostic.h $(DIAGNOSTIC C_PRETTY_PRINT_H = c-family/c-pretty-print.h $(PRETTY_PRINT_H) \ $(C_COMMON_H) $(TREE_H) TREE_INLINE_H = tree-inline.h -REAL_H = real.h $(MACHMODE_H) +REAL_H = real.h LTO_STREAMER_H = lto-streamer.h $(LINKER_PLUGIN_API_H) $(TARGET_H) \ $(CGRAPH_H) $(VEC_H) $(HASH_TABLE_H) $(TREE_H) $(GIMPLE_H) \ $(GCOV_IO_H) $(DIAGNOSTIC_H) alloc-pool.h @@ -2642,7 +2643,7 @@ build/gensupport.o: gensupport.c $(BCONF build/ggc-none.o : ggc-none.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ $(GGC_H) build/min-insn-modes.o : min-insn-modes.c $(BCONFIG_H) $(SYSTEM_H) \ - $(MACHMODE_H) + $(CORETYPES_H) build/print-rtl.o: print-rtl.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ $(GTM_H) $(RTL_BASE_H) build/read-md.o: read-md.c $(BCONFIG_H) $(SYSTEM_H) $(CORETYPES_H) \ @@ -2727,12 +2728,12 @@ CFLAGS-gengtype-parse.o += -DHOST_GENERA build/gengtype-parse.o: $(BCONFIG_H) gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ - gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ + gengtype.h errors.h version.h $(HASHTAB_H) $(OBSTACK_H) \ $(XREGEX_H) CFLAGS-gengtype-state.o += -DHOST_GENERATOR_FILE build/gengtype-state.o: $(BCONFIG_H) gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ - rtl.def insn-notes.def errors.h double-int.h version.h \ + rtl.def insn-notes.def errors.h version.h \ $(HASHTAB_H) $(OBSTACK_H) $(XREGEX_H) CFLAGS-gengtype.o += -DHOST_GENERATOR_FILE build/gengtype.o: $(BCONFIG_H)