From patchwork Thu Oct 29 14:12:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1390152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=adacore-com.20150623.gappssmtp.com header.i=@adacore-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=yKmWdFno; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CMS8L0MHgz9sSC for ; Fri, 30 Oct 2020 01:13:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DC4EA3985479; Thu, 29 Oct 2020 14:13:02 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 5BE613861034 for ; Thu, 29 Oct 2020 14:12:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5BE613861034 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hainque@adacore.com Received: by mail-wr1-x42c.google.com with SMTP id w1so2954748wrm.4 for ; Thu, 29 Oct 2020 07:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore-com.20150623.gappssmtp.com; s=20150623; h=from:mime-version:subject:message-id:date:cc:to; bh=+cQsUIeB+ySiB6A0BnQwhemH+RDeXr+uWSk8pfM7WZY=; b=yKmWdFnobe6WAkVQ1r1WY5TC3wGm/x+muSnYY72shykHA9mPWqjcuCpF7v4EFkZQtO kc6xFFIuxGr7nfIAHacZg+nbYk3p/G5zsp6A2BVPIktsEaqimyVWQfW9b3x1X1nL0FyX tvIPxuYgA8K8P2LrGhLgshGVEUoNfGz6JmKseO2LZMlmT/ZdipINjhI0lKklk+kjWIYM DdxkgokxHLii/sqYS4auhib1m4qay7qTrlEp4rQfO3a+5FtLTVjN+OOvjFwRVytjJgGK Xt32YTXflg3OL96VHbcKN6nL9wunMODEzxZjob8qow4ceF201d0TjFUOvRE5DF5C0lnT 8IkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:cc:to; bh=+cQsUIeB+ySiB6A0BnQwhemH+RDeXr+uWSk8pfM7WZY=; b=acKMgVLncnmO7eMS65a+msL69dXJ/0FEH39TCSCQQaJwYPnpx6dWwBlKcm+qW54VJJ mU2n43k1vi5buSCCKw8n0UDczNuFd0P2nR1BA3DFx4mgCzpxDP7bcqqVm2Sfr00AUgzL Mm7QDqK/lxSSm1FXLtUMZBcFjjlvzHeFRvetYLZ6xOr1XXUfCy7BRGCcnrqhqSwETXuZ HQEZI/2NoVYqHgH4sH2XYjd4t4G+DOjXep9OK6/ocM8YyuZc1w9k+KW3EKyDHFx7NA9V I1v0Qupxis1AanyAbSedKNCF6TS0QpT/g6WcbyJ7JrgU4oM9LtCPXuHGwOQhc5uqxX8u hyrg== X-Gm-Message-State: AOAM530NfI1AjCbss7dxR700pXwKDPQZWhInzRrcKZK5flfgwtEXgKkU Tg7dj+m5++4NPOrnv5GGJyLOkffR0gnoKrUM X-Google-Smtp-Source: ABdhPJzq1bgNSzu5Is+t70c3tryt5dP0a9VqY4A4ZDFGJxpGTzx4tnkOtMUpSUxfE0SPdyZxRwD2hA== X-Received: by 2002:adf:8362:: with SMTP id 89mr6114079wrd.280.1603980778203; Thu, 29 Oct 2020 07:12:58 -0700 (PDT) Received: from imac-2020.home (2a01cb0002912700d5b92c923a062952.ipv6.abo.wanadoo.fr. [2a01:cb00:291:2700:d5b9:2c92:3a06:2952]) by smtp.gmail.com with ESMTPSA id v19sm4494146wmj.31.2020.10.29.07.12.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2020 07:12:57 -0700 (PDT) From: Olivier Hainque Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: [patch] vxworks: Predefine __ppc and __ppc__ for VxWorks 7 Message-Id: Date: Thu, 29 Oct 2020 15:12:57 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Segher Boessenkool Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Unfortunately, some VxWorks 7r2 system headers rely on a couple more variations of the predefined macros expected to characterize a “powerpc” target that we discussed recently. setjmp.h, for example, relies on __ppc and the absence of a definition results in “gcc” dejagnu test failures from all the tests #including that header, which stumble on: #error "_JBLEN not set!” The other case is __ppc__ expected by yvals.h, key to libstdc++. This change adjusts the VxWorks 7 section of our configuration to honor those expectations. Olivier 2020-10-29. Olivier Hainque gcc/ * config/rs6000/vxworks.h (TARGET_OS_CPP_BUILTINS): Also builtin_define __ppc and __ppc__ for VxWorks 7. diff --git a/gcc/config/rs6000/vxworks.h b/gcc/config/rs6000/vxworks.h index 9dabdab323ab..51a3250f5dcc 100644 --- a/gcc/config/rs6000/vxworks.h +++ b/gcc/config/rs6000/vxworks.h @@ -70,6 +70,12 @@ along with GCC; see the file COPYING3. If not see builtin_define ("__PPC"); \ builtin_define ("__powerpc"); \ } \ + \ + /* __ppc isn't emitted by the system compiler \ + any more but a few system headers still depend \ + on it, as well as on __ppc__. */ \ + builtin_define ("__ppc"); \ + builtin_define ("__ppc__"); \ } \ \ /* Asserts for #cpu and #machine. */ \