From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22764 invoked by alias); 8 Oct 2018 11:47:38 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 22753 invoked by uid 89); 8 Oct 2018 11:47:37 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=HX-HELO:sk:mail-ed, Hainque, H*RU:209.85.208.65, Hx-spam-relays-external:209.85.208.65 X-HELO: mail-ed1-f65.google.com Received: from mail-ed1-f65.google.com (HELO mail-ed1-f65.google.com) (209.85.208.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 08 Oct 2018 11:47:35 +0000 Received: by mail-ed1-f65.google.com with SMTP id r1-v6so2812550edd.7 for ; Mon, 08 Oct 2018 04:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=jljKv/CkjdGn/+Nxu/MnDsuKXeEkOcPA4Dg7wm8IJ4Q=; b=hVNleJnvMkDtQlQQgHpbr+8lgjcK+QnHm2nRgn26oEwJtxPd5N7Wt6i78uvzJCN9uO vDdjlbQQGxBs79czrxjrJlY3omC1MIyQtmLVY23nUj7rNmpCHij2CMjEffvWHXegQTKY 4jxbWpDhiAIMaAzyi2F4ZgsJ6uHd0YiqygtcM= Return-Path: Received: from [172.26.255.55] ([193.47.71.171]) by smtp.gmail.com with ESMTPSA id e26-v6sm5929316ede.56.2018.10.08.04.47.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 04:47:32 -0700 (PDT) Subject: Re: [PATCH] fixincludes: vxworks: regs.h: Guard include of vxTypesOld.h by !_ASMLANGUAGE To: Olivier Hainque Cc: GCC Patches , bkorb@gnu.org, =?UTF-8?B?SsOpcsO0bWUgTGFtYm91cmc=?= References: <20180627142715.10534-1-rv@rasmusvillemoes.dk> From: Rasmus Villemoes Message-ID: <06e814b7-48e0-32a9-cd50-059967ab08ed@rasmusvillemoes.dk> Date: Mon, 08 Oct 2018 11:59:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-10/txt/msg00420.txt.bz2 On 2018-09-14 14:39, Olivier Hainque wrote: > > >> On 13 Sep 2018, at 00:25, Rasmus Villemoes wrote: > >>> What happens on your end if you just remove the hack ? > >> Unfortunately, the libstdc++ build breaks: >> >> In file included from >> /usr/powerpc-wrs-vxworks/wind_base/target/h/regs.h:66:0, >> from >> /bld/vestas/auto/work.20180912.214646/gcc-build/gcc/include-fixed/setjmp.h:57, >> from >> /bld/vestas/auto/work.20180912.214646/gcc-build/powerpc-wrs-vxworks/libstdc++-v3/include/csetjmp:42, >> from >> /bld/vestas/auto/work.20180912.214646/gcc-src/libstdc++-v3/include/precompiled/stdc++.h:42: >> /usr/powerpc-wrs-vxworks/wind_base/target/h/arch/ppc/regsPpc.h:33:5: >> error: 'UINT32' does not name a type >> UINT32 cr; /* condition register */ >> ^~~~~~ > > Ah, I see. Thanks for the experiment. > >> I'm happy to add an include of vxCpu in the _ASMLANGUAGE case, along >> with a big comment. But, it's also a small enough patch that we can >> carry it internally, if you prefer that we don't touch this hack upstream. > > I'm fine with a change here. It could only possibly impact inclusions > of regs.h from assembly, and should normally improve that, so the risk > of breaking something is very low. OK, I'll send an updated patch in a moment, adding the vxCpu include in the _ASMLANGUAGE case and keeping vxTypesOld out of _ASMLANGUAGE. > I wonder how we haven't hit the stop above, as it indicates an > inclusion of regs.h without a prior inclusion of vxTypes from the > VxWorks setjmp.h, included unconditionally from precompiled/stdc++.h > via csetjmp. Maybe different set of headers for different versions > of the OS. Yes, I believe other (newer) versions of VxWorks might have more self-contained headers, so they themselves pull in whatever other headers they rely on. Rasmus