From patchwork Sat Dec 3 19:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Salvadore X-Patchwork-Id: 29300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1496428wrr; Sat, 3 Dec 2022 11:35:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6uYar+GgrJMwBE/Jll4H40kausI/AOMIU+aHeWCm3jtR2Wknm3tx0KWaxgh0mm64vj6llt X-Received: by 2002:a17:907:1a53:b0:7b2:b15e:86e6 with SMTP id mf19-20020a1709071a5300b007b2b15e86e6mr49633960ejc.410.1670096140016; Sat, 03 Dec 2022 11:35:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670096140; cv=none; d=google.com; s=arc-20160816; b=1LiBLwUWoy2tTv3zH6U/Kx0hokSfM+GYZnQzTnGEHg1BzqmyEkziS/2QAkQr4Kfdlt VynPu+4lbIAJOJjdgth4z6Xch5zGO/XNLH26oRwlDxbfL2beu2M+XNQ3E066Xmodh9Bm KF0ILpMZAvUKR8tY8a9+sapfBjKYaIPxfQF1S6YvOMnp8+THCdAdl1gdBq55NdVt+6DK Wp74tJ/eER30oQ16S/wHRm7slZoowuavMHlU3VOXJ3dfF/5MVRpsn1/KLNFAGr9JdZkH cv1NaXiBlxbFnKcRo009x2lu9LYYZa2dL8UQDgwAvkRX87TmZzkMmKhZKPaP7Oaa+zQo iJig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:feedback-id:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=xdrf2O5DN3ZxOqgMSWjVo3S2x1QYqhVkS9C52xiU0pQ=; b=U+mDkazV4awbrhnakJpOJOyXGiFolc2Vkqzh116fW10Yv77S2VnMtZF9r+/1Fn7+ky me5xaKxRGAxC7FyxSE5UAzBQ8Tnd3ZmW0qbtCIOFrtAIwLbhcVqYia9wAau2IoktaFiF epoAYMiWlJXqxzSQySHNNS6D2yzEUtnMKnS2YYsvITuSdBgf0CRwfnSCbiIDs9k7BNLt skxjh3ZJo5oKKJWHMt+o2HsyMX9YExa9YUBx7o9thsyQcv6aDD1yMJ92GeoOfxoBJA/r h3/utqcm8gYT7GPhiVShJ56GtjG5bhuEM6SKTVk6nqq2cspxJfAoFMaWCmTjRIaglvCt F8TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="BlFe/dmu"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id qw31-20020a1709066a1f00b007c08a2c2406si8207956ejc.85.2022.12.03.11.35.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Dec 2022 11:35:39 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="BlFe/dmu"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C9E433858C1F for ; Sat, 3 Dec 2022 19:35:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9E433858C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670096138; bh=xdrf2O5DN3ZxOqgMSWjVo3S2x1QYqhVkS9C52xiU0pQ=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=BlFe/dmukh15cN/WgOOpGV59qVnzik14yEAkzHFWQdf39bAT81kYQ4mUKa56JaMDi Oshy8vhKw944EKJFAQaxGZZFrONUcQ82K5klIp9C+YjjZnUUayN/qqUm80HcSce9wR 9sDvS6Bi6RcIY/VI2lWl4+HnDcOR7ElA7Q8Nifik= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-40136.proton.ch (mail-40136.proton.ch [185.70.40.136]) by sourceware.org (Postfix) with ESMTPS id 4FD683858D20 for ; Sat, 3 Dec 2022 19:34:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4FD683858D20 Date: Sat, 03 Dec 2022 19:34:42 +0000 To: "gcc-patches@gcc.gnu.org" , "jit@gcc.gnu.org" Cc: "dmalcolm@redhat.com" , "richard.guenther@gmail.com" Subject: Ping: [PATCH] jit: Install jit headers in $(libsubincludedir) [PR 101491] Message-ID: Feedback-ID: 53711648:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=unavailable 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: Lorenzo Salvadore via Gcc-patches From: Lorenzo Salvadore Reply-To: Lorenzo Salvadore Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751222730351689011?= X-GMAIL-MSGID: =?utf-8?q?1751222730351689011?= Hello, Ping https://gcc.gnu.org/pipermail/gcc-patches/2022-November/606450.html Thanks, Lorenzo Salvadore --- From f8e2c2ee89a7d8741bb65163d1f1c20edcd546ac Mon Sep 17 00:00:00 2001 From: Lorenzo Salvadore Date: Wed, 16 Nov 2022 11:27:38 +0100 Subject: [PATCH] jit: Install jit headers in $(libsubincludedir) [PR 101491] Installing jit/libgccjit.h and jit/libgccjit++.h headers in $(includedir) can be a problem for machines where multiple versions of GCC are required simultaneously, see for example this bug report on FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257060 Hence, - define $(libsubincludedir) the same way it is defined in libgomp; - install jit/libgccjit.h and jit/libgccjit++.h in $(libsubincludedir). The patch has already been applied successfully in the official FreeBSD ports tree for the ports lang/gcc11 and lang/gcc12. Please see the following commits: https://cgit.freebsd.org/ports/commit/?id=0338e04504ee269b7a95e6707f1314bc1c4239fe https://cgit.freebsd.org/ports/commit/?id=f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d gcc/ChangeLog: 2022-11-16 Lorenzo Salvadore PR jit/101491 * Makefile.in: Define and create $(libsubincludedir) gcc/jit/ChangeLog: 2022-11-16 Lorenzo Salvadore PR jit/101491 * Make-lang.in: Install headers in $(libsubincludedir) --- gcc/Makefile.in | 3 +++ gcc/jit/Make-lang.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.38.0 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f672e6ea549..3bcf1c491ab 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -635,6 +635,8 @@ libexecdir = @libexecdir@ # Directory in which the compiler finds libraries etc. libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) +# Directory in which the compiler finds headers. +libsubincludedir = $(libdir)/gcc/$(target_alias)/$(version)/include # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed @@ -3642,6 +3644,7 @@ install-cpp: installdirs cpp$(exeext) # $(libdir)/gcc/include isn't currently searched by cpp. installdirs: $(mkinstalldirs) $(DESTDIR)$(libsubdir) + $(mkinstalldirs) $(DESTDIR)$(libsubincludedir) $(mkinstalldirs) $(DESTDIR)$(libexecsubdir) $(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(includedir) diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in index 248ec45b729..ba1b3e95da5 100644 --- a/gcc/jit/Make-lang.in +++ b/gcc/jit/Make-lang.in @@ -360,9 +360,9 @@ selftest-jit: # Install hooks: jit.install-headers: installdirs $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \ - $(DESTDIR)$(includedir)/libgccjit.h + $(DESTDIR)$(libsubincludedir)/libgccjit.h $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ - $(DESTDIR)$(includedir)/libgccjit++.h + $(DESTDIR)$(libsubincludedir)/libgccjit++.h ifneq (,$(findstring mingw,$(target))) jit.install-common: installdirs jit.install-headers