From patchwork Mon Apr 27 10:09:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 464929 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 72023140082 for ; Mon, 27 Apr 2015 20:09:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=GzO0mItG; dkim-adsp=none (unprotected policy); dkim-atps=neutral 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 :content-transfer-encoding; q=dns; s=default; b=TmGaARyB/Sg1ZO9D d6xsnvwD8m31cOIYc9fxoD1KP+oCYrq+wMrceCUStNAUojWVL8YK2mGPSn/KYsTw 6fX0D/pWyCB6xKVttx71kt6BkIZLjazvGtyr0B0UuNJGaz17aLb+By16GJfdUIVN b0X8AgFIx6y9RNArZ+Ly41pUEi4= 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 :content-transfer-encoding; s=default; bh=u3AfBUvmUi3LSJ0loRlBcq 1FD8I=; b=GzO0mItGEtU+SmuLu47sRYpY0P4OcWjcCrdPOMfv+6PwIybcdTn5vO 9JEXo11DTccMCUbpoxuuRcLKLDxkm87COe5s6NKsZTAlMJyQcw/vIUmbhJVQ5lMw K7MHKQd6Cirw+BlXzkp1qFord7yIYUBYKqg6QSjS0MPh0wJPBb6IA= Received: (qmail 12273 invoked by alias); 27 Apr 2015 10:09:31 -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 12260 invoked by uid 89); 27 Apr 2015 10:09:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, SPF_PASS autolearn=no version=3.3.2 X-HELO: eu-smtp-delivery-143.mimecast.com Received: from eu-smtp-delivery-143.mimecast.com (HELO eu-smtp-delivery-143.mimecast.com) (207.82.80.143) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 27 Apr 2015 10:09:29 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by uk-mta-26.uk.mimecast.lan; Mon, 27 Apr 2015 11:09:26 +0100 Received: from localhost ([10.1.2.79]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 27 Apr 2015 11:09:26 +0100 From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: Add a build version of inchash.o Date: Mon, 27 Apr 2015 11:09:26 +0100 Message-ID: <87iochyjah.fsf@e105548-lin.cambridge.arm.com> User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-MC-Unique: ymS3H3JLThmIfkGTcIlAzg-1 The generator patch that I'm about to post wants to use inchash.c, so this patch adds it to the list of files that are built for the build system as well as the host. Tested on x86_64-linux-gnu. OK to install? Thanks, Richard gcc/ * inchash.h, inchash.c: Include bconfig.h for build objects. * Makefile.in (build/inchash.o): New rule. Index: gcc/inchash.h =================================================================== --- gcc/inchash.h 2015-04-27 10:38:48.000000000 +0100 +++ gcc/inchash.h 2015-04-27 10:42:57.783191573 +0100 @@ -20,7 +20,11 @@ Software Foundation; either version 3, o #ifndef INCHASH_H #define INCHASH_H 1 +#ifdef GENERATOR_FILE +#include "bconfig.h" +#else #include "config.h" +#endif #include "system.h" #include "coretypes.h" #include "hashtab.h" Index: gcc/inchash.c =================================================================== --- gcc/inchash.c 2015-04-27 10:38:48.000000000 +0100 +++ gcc/inchash.c 2015-04-27 10:42:57.783191573 +0100 @@ -17,7 +17,11 @@ Software Foundation; either version 3, o along with GCC; see the file COPYING3. If not see . */ +#ifdef GENERATOR_FILE +#include "bconfig.h" +#else #include "config.h" +#endif #include "system.h" #include "coretypes.h" #include "hashtab.h" Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in 2015-04-27 10:38:48.000000000 +0100 +++ gcc/Makefile.in 2015-04-27 10:42:57.783191573 +0100 @@ -2434,6 +2434,8 @@ build/vec.o : vec.c $(BCONFIG_H) $(SYSTE $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H) build/hash-table.o : hash-table.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \ $(HASH_TABLE_H) $(GGC_H) toplev.h $(DIAGNOSTIC_CORE_H) +build/inchash.o : inchash.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \ + $(HASHTAB_H) inchash.h build/gencondmd.o : build/gencondmd.c $(BCONFIG_H) $(SYSTEM_H) \ coretypes.h $(GTM_H) insn-constants.h \ $(filter-out insn-flags.h, $(RTL_H) $(TM_P_H) $(FUNCTION_H) $(REGS_H) \