From nobody Wed Dec 22 10:06:25 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EFE5F19066E3; Wed, 22 Dec 2021 10:06:32 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJprN2CCMz4Z0S; Wed, 22 Dec 2021 10:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DF941B1D6; Wed, 22 Dec 2021 10:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA6Pnu092660; Wed, 22 Dec 2021 10:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6Pjm092659; Wed, 22 Dec 2021 10:06:25 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:25 GMT Message-Id: <202112221006.1BMA6Pjm092659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c37c3d580eb3 - stable/12 - clang: allow -fstack-clash-protection on FreeBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c37c3d580eb36c1b9dfb608412904b30c997aab3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHXO9pPM6ISK2a0SelP/l/r5zc0U5oIu7c4pzIfL5K4=; b=DZ8RjTiwV5n0K4b6S7eyZxIVflzJ+dAB0yWz8TD6FFYiQuhu7dDvae6ccIXgr4aR762Iiu wMUhje5LT3y711OsjUCRd5qgdm0r1vNv8nvwXZX7J8xxtIys5O6AQ7NPDB/qzrRW3PyAaK gzbgiDdgmGceK+l1tHcJEswiiti2wJeKnSGYlzFijtF+y3Qcbc+ngTGkTrhBQLAJ6jAUuD nrPCCjtr9118KkBPJpmUjn6jhWCZuD7wZRQKKjDalZMYYvs7v2a2GRS94RG1KXtwxcRMba EO0nEa+7rXRVbo1wbeNroX7ZWCNP6UcbCYu9Xed82ty25jEONdkLlDfQmRcgZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167591; a=rsa-sha256; cv=none; b=ZS+nb21n4R1fKzUTjBywdXawMQtoz2kjD9NxdW6E7FMTgvIfU69Uhut5y7TurDGSyY+Zut +ulihoIRmY2UXhL+3DAOXKLypj73sPgBtOjFH/7X3Y3MQeJjNJhSS6ZxBY7aKmYWjwvZOX QbrMRtOluxOxTzNuOW0lWJzSWglclX0JcZiNUhbMoQz29+sZpQbesLsvQIEWcrNmF+6xFh TQY+yQKEQfulo4IaclG1sPyYsWXhyU/Xj/BL6ewPHxCQt5zrp+CZl6yaHi4KGR5T+3IG6O SWxpo0pe16IhLX+5q2jEscPn3KybrlePwhEbUka6Wy4t2gCwF/EIUeUPh6ZG4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c37c3d580eb36c1b9dfb608412904b30c997aab3 commit c37c3d580eb36c1b9dfb608412904b30c997aab3 Author: Ed Maste AuthorDate: 2020-11-25 14:26:13 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:23 +0000 clang: allow -fstack-clash-protection on FreeBSD -fstack-clash-protection was added in Clang commit e67cbac81211 but was enabled only on Linux. It should work fine on FreeBSD as well, so enable it. To be discussed and upstreamed with a test. The OS test should probably just be removed. Reviewed by: dim MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27366 (cherry picked from commit 3063e1e56b509373d143a3a4c67d388bd390f268) --- contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp index af4bcf951e6c..01024ee3a16a 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp @@ -2967,7 +2967,7 @@ static void RenderSCPOptions(const ToolChain &TC, const ArgList &Args, ArgStringList &CmdArgs) { const llvm::Triple &EffectiveTriple = TC.getEffectiveTriple(); - if (!EffectiveTriple.isOSLinux()) + if (!EffectiveTriple.isOSFreeBSD() && !EffectiveTriple.isOSLinux()) return; if (!EffectiveTriple.isX86() && !EffectiveTriple.isSystemZ() &&