From patchwork Fri Mar 19 15:49:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1455935 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) 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=fmb9FRuv; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4F27cn0grCz9sRf for ; Sat, 20 Mar 2021 02:49:44 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 35F83385783D; Fri, 19 Mar 2021 15:49:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 25C033857C7F for ; Fri, 19 Mar 2021 15:49:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 25C033857C7F 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-x436.google.com with SMTP id k8so9580420wrc.3 for ; Fri, 19 Mar 2021 08:49:38 -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=dTrEnJaOeS+pCWUZLf9VxGkuzddmmtJm6QgOzEnad4s=; b=fmb9FRuv1FYCnKV3Iepp8TZlo4Eqojzq0zlq31KYnGUvrMiNz/rWTgEc+nADt2MWTw bO5Qtzzntg+/T4moQqq0yTemXiBBbnQHbWvPxoxrII1JoGWQujCLvIprYUqbvth6pWY7 z8cS9YdAO11vOqaRMiELyWZjOrHcLAgF/RPscyLc5Csmq2g4+98wqUxVbRBw1dbtrgTT VH4AXul/c1bGh3rwipNRgrpgCNzxTL0tC5xSoyx7aMFEYdbQqFINU/OhXRVCJxqZ/LhB 3wJV9I+Unj5OfAr36n6cQgd59+F4QAeN4Er73ZhganZ/4RsMVY+XnRoCir+gKYqYNMxb /YCQ== 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=dTrEnJaOeS+pCWUZLf9VxGkuzddmmtJm6QgOzEnad4s=; b=XbEXOPw6miWV5hpxLqifKK6ZT3o7QYDTxuGoJa+2xvov1VXKuAmwDr1ryBWQMFS8QD r5tOBpwF68XAxSrukob7jYoGZnDuAbiGlug8aNCLAbx/wlaZHtx7L6nfyprlci/cxULL PPyEbjhglJOOyin28t7mz/K9VNQff15hKoeo7y3qOtTG/Uqdo4O+GYlgOvctB5ah7oAi zLV6V/y07VFFSRQRp6gPaHfoPBIdJtMQUSzyAAkWYqNCfnmG39gQZttVu5qFskCERWtd n+muMeqPE1J6Gu6LnSTdXTaY49ePjqTFgOq4v99AnySG5YgBKzzS+t+nBcP1l8oldbIx 7Tkw== X-Gm-Message-State: AOAM530pPMAuoyM51Cn9T4wl+DrGnyvqCVdVAyIiVu1RshaSioZt0gco W2d5seB8oqQTkcv+odQqrYxFDi+Shy2cmA== X-Google-Smtp-Source: ABdhPJxIwbD4siVMqu3kh3QS7ICLDffSo8OVSUq9iJHNhezej6w1VaQMw8B2U26UKPet6VOmDhqkNA== X-Received: by 2002:a5d:47a9:: with SMTP id 9mr5240584wrb.368.1616168977232; Fri, 19 Mar 2021 08:49:37 -0700 (PDT) Received: from imac-2020.home (2a01cb0002912700f9e47682555203c3.ipv6.abo.wanadoo.fr. [2a01:cb00:291:2700:f9e4:7682:5552:3c3]) by smtp.gmail.com with ESMTPSA id p18sm8282228wrs.68.2021.03.19.08.49.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Mar 2021 08:49:36 -0700 (PDT) From: Olivier Hainque Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Fix for PR target/99660 - vxworksae/mils build failure from missing VX_CPU_PREFIX Message-Id: Date: Fri, 19 Mar 2021 16:49:36 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hello, This fixes an oversight which causes make all-gcc to fail for --target=*vxworksae or vxworksmils, a regression introduced by the recent VxWorks7 related updates. Thanks @Martin for opening the PR. Both AE and MILS variants resort to a common config/vxworksae.h, which misses a definition of VX_CPU_PREFIX expected by port specific headers. The change just provides the missing definition. Tested by checking that I could reproduce the failure for powerpc-wrs-vxworksae, then that all-gcc passes after the patch for powerpc-wrs-vxworksae, x86-wrs-vxworksae and powerpc-wrs-vxworksmils. With Kind Regards, Olivier 2021-03-19 Olivier Hainque gcc/ PR target/99660 * config/config/vxworksae.h (VX_CPU_PREFIX): Define. diff --git a/gcc/config/vxworksae.h b/gcc/config/vxworksae.h index 0f9b55357892..86d1923b718f 100644 --- a/gcc/config/vxworksae.h +++ b/gcc/config/vxworksae.h @@ -64,6 +64,10 @@ along with GCC; see the file COPYING3. If not see /* Both kernels and RTPs have the facilities required by this macro. */ #define TARGET_POSIX_IO +/* The AE/653 system headers all predate the introduction of _VX_ prefixes + ahead of CPU families of macros. */ +#define VX_CPU_PREFIX "" + /* A VxWorks 653 implementation of TARGET_OS_CPP_BUILTINS. */ #define VXWORKS_OS_CPP_BUILTINS() \ do \