From nobody Wed Dec 22 10:05:47 2021 X-Original-To: dev-commits-src-all@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 E009C1905762; Wed, 22 Dec 2021 10:05:58 +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 4JJpqh5tfHz4YKT; Wed, 22 Dec 2021 10:05:52 +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 DBEF51B4AC; Wed, 22 Dec 2021 10:05:47 +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 1BMA5lXN091832; Wed, 22 Dec 2021 10:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5ll6091831; Wed, 22 Dec 2021 10:05:47 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:47 GMT Message-Id: <202112221005.1BMA5ll6091831@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: 1d6829066557 - stable/12 - Reapply r362235 (by kp): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1d6829066557a673a8fe85ad2f91c024d3a014f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167554; 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=/C5LY2JZ4bCGwafVbeTBW//N1HQxiWy63ZDoVdreXpg=; b=cZkZYV3REiVtMeZb+FihsFx8V1a33G8j8s5EGBH7JIsDJrw2LTfMHD97mhYXY0P4CKpBDf TdnqaKkkD8x5jEmP8VAAYQeISLU33gtlqO3oTf7uA004zXjFpzKOi+a/fN7GgmGNsPxk0+ RojxzxuW98kQS4FS/9gXATeF6/uls/+wK19bSvG/Kg0RTaEWr9htSz/Uk1+ebPLGO1xBki dFKB6IIsUVbVlHS7a8FoZ/t0pHoHGds/LfP5TkYPdGAWbTTsbNjlVqKZNNKkU++vwFJpCm +m4Xi7Xr6crHalHKYQVAkWYSmBqJ0bYZDmawtGnD6qe2Psm3k/ObaEXRS33GLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167555; a=rsa-sha256; cv=none; b=tR3euLb2bNiuEg6drMBuHgboG1UbK6m7eMqCUPuJYXAh8A6hG3NrYrLqv+e1s+PqN1i1VP iFSUuBxfaDfRVLVBDrGeez3rQwAi2N36tIiRG2Z7Oj+OWH0e3i3bXpxi4zTw1pwsiEdMAf uphRLlyuurdwQXafTm4cbc0ItAfPNAURMkeATjBIIoEZCeW6r4xCVilrzAn5KXxmxkVNLj 9PE1l2R0oD4rnULRTAD2q0C/EITGlJK1IWSRC8Yh44ibQrGW2k7cH+Hst9kn3Z+wF4E9SD I7AkvO4pI486bevQsdC9yVtqxklOl87lGPJJAY9T6n2OrNoqLNYooFpdawuIvA== 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=1d6829066557a673a8fe85ad2f91c024d3a014f4 commit 1d6829066557a673a8fe85ad2f91c024d3a014f4 Author: Dimitry Andric AuthorDate: 2020-08-06 19:24:17 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:23 +0000 Reapply r362235 (by kp): llvm: Default to -mno-relax on RISC-V Compiling on a RISC-V system fails with 'relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax'. Our default linker (ld.lld) doesn't support relaxation, so default to no-relax so we don't generate object files the linker can't handle. Reviewed by: mhorne Sponsored by: Axiado Differential Revision: https://reviews.freebsd.org/D25210 (cherry picked from commit 82343267e32c24c6c577bc9cdae394d84c623507) --- contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp index be3f0a07b576..b1ddd3d83909 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -536,8 +536,9 @@ void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple, if (Args.hasArg(options::OPT_ffixed_x31)) Features.push_back("+reserve-x31"); - // -mrelax is default, unless -mno-relax is specified. - if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true)) + // FreeBSD local, because ld.lld doesn't support relaxations + // -mno-relax is default, unless -mrelax is specified. + if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, false)) Features.push_back("+relax"); else Features.push_back("-relax");