From patchwork Wed Jun 6 16:38:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rbmj X-Patchwork-Id: 163397 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]) by ozlabs.org (Postfix) with SMTP id 8CBC9B6EEC for ; Thu, 7 Jun 2012 02:38:57 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1339605537; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-id:Date:From:User-Agent:MIME-version:To:Cc:Subject: References:In-reply-to:Content-type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=nH4oIKkHgk3h5m1B/PulXst2biY=; b=vJsE3pBNq4MTCkp pdebGKxGN7U2Ebwi6tkcVWIY92zXs6IMhbj/kcNPypvk2bmfe4n+E2o8/ugoGu5J m4nq2dasje30asVw/n5dmuI5y8LjB5v1AlnL+Yvn0Ro5cRbfmiBzPKJY/RM9L1WA Yt+mSh5ISggWoBtQgWS80FsSTBK4= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Message-id:Date:From:User-Agent:MIME-version:To:Cc:Subject:References:In-reply-to:Content-type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=mP4NpEy9r58LZUDeWqSZ60XKYh4nKYSFheye6YvggPnxHj6XKVVnloveH5gnrt xx08dWYuXRKY7qiPJldMEnnxWGN8qMKB3ohwSks09DIibeCgrc+s6DEqqT1L5KA6 YqcYWqkt/zDGxEVPxn8xOOA/KMxRPfjivn/ENcCoHFCpI=; Received: (qmail 22387 invoked by alias); 6 Jun 2012 16:38:47 -0000 Received: (qmail 22373 invoked by uid 22791); 6 Jun 2012 16:38:46 -0000 X-SWARE-Spam-Status: No, hits=3.2 required=5.0 tests=AWL, BAYES_50, BOTNET, KHOP_THREADED, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from vms173019pub.verizon.net (HELO vms173019pub.verizon.net) (206.46.173.19) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Jun 2012 16:38:34 +0000 Received: from [10.97.33.69] ([unknown] [151.188.105.156]) by vms173019.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M5700GYYFJILDGO@vms173019.mailsrvcs.net> for gcc-patches@gcc.gnu.org; Wed, 06 Jun 2012 11:38:07 -0500 (CDT) Message-id: <4FCF876E.1020602@verizon.net> Date: Wed, 06 Jun 2012 12:38:06 -0400 From: rbmj User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-version: 1.0 To: gcc-patches@gcc.gnu.org Cc: nathan@codesourcery.com, bkorb@gnu.org Subject: [PATCH 5/7] Add fix to prevent accidental inclusion of regs.h on, VxWorks. References: <4FCF863E.6090400@verizon.net> In-reply-to: <4FCF863E.6090400@verizon.net> Content-type: multipart/mixed; boundary=------------070902080008090109020703 X-IsSubscribed: yes 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 VxWorks has it's own regs.h that conflicts with GCC's regs.h, so just make any replace any references to regs.h in VxWorks with references to arch/../regs.h, which includes the VxWorks header, not GCC's header. Changes: * fixincludes/inclhack.def: Added vxworks_regs fix --- fixincludes/inclhack.def | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) From 2aa0effcb0e5b617e099a8390ce97677ba27a49a Mon Sep 17 00:00:00 2001 From: rbmj Date: Mon, 4 Jun 2012 14:07:32 -0400 Subject: [PATCH 5/7] Add fix to prevent accidental inclusion of regs.h on VxWorks. VxWorks has it's own regs.h that conflicts with GCC's regs.h, so just make any replace any references to regs.h in VxWorks with references to arch/../regs.h, which includes the VxWorks header, not GCC's header. Changes: * fixincludes/inclhack.def: Added vxworks_regs fix --- fixincludes/inclhack.def | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 54a8b8d..a258f10 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -4473,6 +4473,20 @@ fix = { "# define\t__INCstath "; }; +/* + * Make it so VxWorks does not include gcc/regs.h accidentally + */ +fix = { + hackname = vxworks_regs; + mach = "*-*-vxworks*"; + + select = "#[\t ]*include[\t ]+"; + c_fix = format; + c_fix_arg = "#include "; + + test_text = "#include \n"; +}; + /* * Another bad dependency in VxWorks 5.2 . -- 1.7.5.4