From owner-svn-ports-branches@freebsd.org Fri Apr 17 16:02:50 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2464F2BEF07; Fri, 17 Apr 2020 16:02:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 493gpx6TZwz49Xp; Fri, 17 Apr 2020 16:02:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E2E525098; Fri, 17 Apr 2020 16:02:49 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03HG2n7r040844; Fri, 17 Apr 2020 16:02:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03HG2mkT040842; Fri, 17 Apr 2020 16:02:48 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202004171602.03HG2mkT040842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 17 Apr 2020 16:02:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531945 - in branches/2020Q2/devel/llvm90: . files/clang X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q2/devel/llvm90: . files/clang X-SVN-Commit-Revision: 531945 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 16:02:51 -0000 Author: jbeich Date: Fri Apr 17 16:02:48 2020 New Revision: 531945 URL: https://svnweb.freebsd.org/changeset/ports/531945 Log: MFH: r531783 devel/llvm90: backport --target fix for libc++ Approved by: brooks (maintainer) Approved by: ports-secteam blanket (required by Firefox 76) Differential Revision: https://reviews.freebsd.org/D24420 Added: branches/2020Q2/devel/llvm90/files/clang/patch-D77776 - copied unchanged from r531783, head/devel/llvm90/files/clang/patch-D77776 Modified: branches/2020Q2/devel/llvm90/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/devel/llvm90/Makefile ============================================================================== --- branches/2020Q2/devel/llvm90/Makefile Fri Apr 17 15:27:08 2020 (r531944) +++ branches/2020Q2/devel/llvm90/Makefile Fri Apr 17 16:02:48 2020 (r531945) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 9.0.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} Copied: branches/2020Q2/devel/llvm90/files/clang/patch-D77776 (from r531783, head/devel/llvm90/files/clang/patch-D77776) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/devel/llvm90/files/clang/patch-D77776 Fri Apr 17 16:02:48 2020 (r531945, copy of r531783, head/devel/llvm90/files/clang/patch-D77776) @@ -0,0 +1,20 @@ +[Driver] Default to libc++ on FreeBSD + +Downstream may naively translate between DSL and LLVM target +triple. If OS version is lost in the process then Clang would +default to a version that's no longer supported by OS vendor. + +https://reviews.llvm.org/D77776 + +--- tools/clang/lib/Driver/ToolChains/FreeBSD.cpp.orig 2019-12-11 19:15:30 UTC ++++ tools/clang/lib/Driver/ToolChains/FreeBSD.cpp +@@ -351,7 +351,8 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple & + } + + ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const { +- if (getTriple().getOSMajorVersion() >= 10) ++ unsigned Major = getTriple().getOSMajorVersion(); ++ if (Major >= 10 || Major == 0) + return ToolChain::CST_Libcxx; + return ToolChain::CST_Libstdcxx; + }