From patchwork Fri Oct 23 15:45:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1386830 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; 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=SDOS59qX; 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 4CHpVD161cz9sTL for ; Sat, 24 Oct 2020 02:45:54 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 277A5398B414; Fri, 23 Oct 2020 15:45:52 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 878B6385801D for ; Fri, 23 Oct 2020 15:45:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 878B6385801D 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-x42e.google.com with SMTP id n6so2400198wrm.13 for ; Fri, 23 Oct 2020 08:45:49 -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=vACAeRzIBxpeMEB7IM+L1GxSzl05zLK3ZsA+jPI2TuI=; b=SDOS59qXtiSmWfYtQKBnSOuBRzQ+pIRxB8qxphJKMYvDNwLj6Qcs6mvhk6fM/rq4Jt bRsqckZe5WcdcqzLqaaBijeZkWrPhRJ5dEp++mT/W1vXtC4LHVKk0ypE/ent39FAHkU1 l16SPc+0KQRB2YsJMRniQgo6mmO0YdN/4ztNt4RRGGrO81wXIJKX2wp82Zo2YwjCOCJY RRIZXsW4C8IdyqvNFsyMGsjvDxGNFfgCSGwFCnlREH3fpEpJHO0OhCPbLSsnkvZrH4Z1 5GozmLlFr+WbTMvI0ItdWtTgiZdbea+GHGQtv0rUjPSPA52tvpn7tIngDBexvIUtB3l6 /A9w== 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=vACAeRzIBxpeMEB7IM+L1GxSzl05zLK3ZsA+jPI2TuI=; b=dRpHAJ9eiKX1+oiXGaJheTCwD1DKdAM7bHAG4enikWI6dxRgtM6priL5HhPSSaAJMq jxSbSWmvINYIRfH7SNPmcVIPLv4bp0bVgoUO8uPAkVO1TiDAELpJqtIIaToKWYp4LJLR DdsUUvoOp4g32e3kAxEgaz4xuS/9mXUcSlDM+DBss+Bp2+wMhQNRaaurPVsgmbIc9+Ib vhfhZHo2py2fH8tGDdvijMx+VVVFe36otEvP7vkI1a1I7CejQ48BMqD7uIdAqGcRpH1j 3erWzcXR+1JJ9KWBwX0tl/Lpy/DwRm3GMCArRNu7mt6U2q35nChxjjyNCpS/wj2WOwPa 7Y0A== X-Gm-Message-State: AOAM530gSI0QH1VCY7Aen3JYkOcE+QCwzS/zFMI61QgDruPJZVqkIKxf 5+5X1/HEsVOtR1rwzrCixSfn1dcCgh6zDKB3 X-Google-Smtp-Source: ABdhPJzWSg+b1NPl3zUYW3e9enElHyeO7kt7EO7gUYlnm8Ax/zgTMDVToJEGhJ2kOpyes9vPcZL38Q== X-Received: by 2002:a5d:6506:: with SMTP id x6mr3523512wru.71.1603467948301; Fri, 23 Oct 2020 08:45:48 -0700 (PDT) Received: from ?IPv6:2a02:2ab8:224:1:49c5:164e:a18a:c8a8? ([2a02:2ab8:224:1:49c5:164e:a18a:c8a8]) by smtp.gmail.com with ESMTPSA id v11sm3653534wml.26.2020.10.23.08.45.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2020 08:45:47 -0700 (PDT) From: Olivier Hainque Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: [patch] vxworks: Link with the configured net lib on vxworks7 Message-Id: <9F532EA6-6E8F-475D-8664-846FE9B60FD2@adacore.com> Date: Fri, 23 Oct 2020 17:45:47 +0200 To: GCC Patches X-Mailer: Apple Mail (2.3445.9.1) X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no 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: Douglas B Rupp Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" The net library is configurable on vxworks7. Pick the library to include in link closures in accordance with the availability of a revealing header file, using the recently introduced if-exist-then-else spec builtin function. Tested on a mix of gcc-9 and gcc-10 based builds for Vxworks7r2, and sanity checked that a powerpc-vxworks build passes for languages=c,c++ with mainline sources. Committing to mainline. Olivier 2021-10-23 Douglas Rupp gcc/ * config/vxworks.h (VXWORKS_NET_LIBS_RTP): Use -lrtnet if rtnetStackLib.h is available, fallback to -lnet otherwise. --- a/gcc/config/vxworks.h +++ b/gcc/config/vxworks.h @@ -90,7 +90,7 @@ along with GCC; see the file COPYING3. If not see #define VXWORKS_SYSCALL_LIBS_RTP #if TARGET_VXWORKS7 -#define VXWORKS_NET_LIBS_RTP "-lnet" +#define VXWORKS_NET_LIBS_RTP "-l%:if-exists-then-else(%:getenv(VSB_DIR /usr/h/public/rtnetStackLib.h) rtnet net)" #else #define VXWORKS_NET_LIBS_RTP "-lnet -ldsi" #endif