From patchwork Wed Jul 6 13:31:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1652986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=fCAsNOyb; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LdL7v08xCz9s07 for ; Wed, 6 Jul 2022 23:32:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B3E323853563 for ; Wed, 6 Jul 2022 13:32:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B3E323853563 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657114360; bh=fOhWO67qZ9OoE9mm+rds0nCQYIFoULIUE6X5teublnI=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=fCAsNOybx2hU+V1Gjj5Ru7mkwDgK+rgFrI6beR02OyDqCiYwz3Zwp4bRE78za3GPj DxJeEqRekYBBeuPpVSJLu3rcMfohJxbe+XOMWpiPOT0h2fLiK4i0yesZoW8PEzKmM4 tVMnC7+YkR/9uBoJrYuMRYAS8igGmJU5RfJM/qj4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id AB98E3857351 for ; Wed, 6 Jul 2022 13:31:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AB98E3857351 Received: by mail-wr1-x42f.google.com with SMTP id h17so8943772wrx.0 for ; Wed, 06 Jul 2022 06:31:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=fOhWO67qZ9OoE9mm+rds0nCQYIFoULIUE6X5teublnI=; b=7h5GkYWX17IyAkTKz1eAxcC9ZjU/hq0x7mdhnhliy3jjWlMYmtiaDqfG/0UDl153iv UzGcfCoYgRwOxoc2QqaKuzDfFiIsxAMKPqEEuiJK3mw7eGBKW09aGRo7m0rFFxqw9p2J og5iUrLBNkm1PNhuJ/ri1XYBNn3LAut2bi4VI2w/yFzPNXXwxiSCCEpIhzRLeYsF8lK2 MrX6HVVawYgihs0A5e9V+PH0INRDllltah0IUYV2wIwQIJw6tfvbyyd5ThM0h6i+wQDi +YJAKhUFTR2AuMsr8crLpCedu9CNWj3YUr8v1BVbNaOHKQSYmcx4XIq4+ubhxWASqQD2 epzQ== X-Gm-Message-State: AJIora8dsMJIIkBaaaEYycPdtqxOK1esG6gkSjELOJlhknSMRR49oSBI eJ/82JELgfg54VxiFjq63Wv1xNtbw1+FmA== X-Google-Smtp-Source: AGRyM1vz6sjPHp4hZVZmEEzGb/MFEmZJZ4uKpCwi3odzAZc76pp878sR2fGVGJgKzLecZuvltrPxwA== X-Received: by 2002:adf:f0d2:0:b0:21d:78b0:33c1 with SMTP id x18-20020adff0d2000000b0021d78b033c1mr5400167wro.122.1657114284466; Wed, 06 Jul 2022 06:31:24 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id a11-20020a056000100b00b0021b8c554196sm1967957wrx.29.2022.07.06.06.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 06:31:23 -0700 (PDT) Date: Wed, 6 Jul 2022 13:31:23 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Vxworks7* - Makefile.rtl rtp vs rtp-smp cleanup Message-ID: <20220706133123.GA2203130@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Doug Rupp Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Only smp runtimes are built for vxworks7*, even though the -smp suffix is removed during install. Therefore, in general, the build macros for the non-smp runtimes are superfluous except on the legacy ppc-vxworks6 target where both the smp and non-smp runtime are built. Lastly, an error message is added if a runtime build is commanded that doesn't exist, rather then letting the build mysteriously fail. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * Makefile.rtl [arm,aarch64 vxworks7]: Remove rtp and kernel build macros and set an error variable if needed. [x86,x86_vxworks7]: Likewise. [ppc,ppc64]: Set an error variable if needed. (rts-err): New phony Makefile target. (setup-rts): Depend on rts-err. diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl --- a/gcc/ada/Makefile.rtl +++ b/gcc/ada/Makefile.rtl @@ -1124,6 +1124,7 @@ ifeq ($(strip $(filter-out powerpc% wrs vxworks vxworks7%, $(target_cpu) $(targe EH_MECHANISM=-gcc + # The rtp and kernel sections must be retained for the sake of ppc-vx6 ifeq ($(strip $(filter-out rtp,$(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS += \ s-vxwext.ads