From owner-svn-src-projects@freebsd.org Sun Sep 22 17:31:27 2019 Return-Path: Delivered-To: svn-src-projects@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 F0DA5127C07 for ; Sun, 22 Sep 2019 17:31:27 +0000 (UTC) (envelope-from dim@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 46bvdC61SZz41h3; Sun, 22 Sep 2019 17:31:27 +0000 (UTC) (envelope-from dim@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 B27F01E9C; Sun, 22 Sep 2019 17:31:27 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8MHVRrB083631; Sun, 22 Sep 2019 17:31:27 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8MHVRlC083630; Sun, 22 Sep 2019 17:31:27 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201909221731.x8MHVRlC083630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 22 Sep 2019 17:31:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r352600 - projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch X-SVN-Commit-Revision: 352600 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2019 17:31:28 -0000 Author: dim Date: Sun Sep 22 17:31:27 2019 New Revision: 352600 URL: https://svnweb.freebsd.org/changeset/base/352600 Log: Pull in r372513 from upstream lld trunk (by Simon Atanasyan): [mips] Deduce MIPS specific ELF header flags from `emulation` In case of linking binary blobs which do not have any ELF headers, we can deduce MIPS ABI ELF header flags from an `emulation` option. Patch by Kyle Evans. Requested by: kevans :) Modified: projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch/MipsArchTree.cpp Modified: projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch/MipsArchTree.cpp ============================================================================== --- projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch/MipsArchTree.cpp Sun Sep 22 16:10:25 2019 (r352599) +++ projects/clang900-import/contrib/llvm/tools/lld/ELF/Arch/MipsArchTree.cpp Sun Sep 22 17:31:27 2019 (r352600) @@ -294,12 +294,30 @@ static uint32_t getArchFlags(ArrayRef files return ret; } +// If we don't have any input files, we'll have to rely on the information we +// can derive from emulation information, since this at least gets us ABI. +static uint32_t getFlagsFromEmulation() { + uint32_t ret = 0; + + if (config->emulation.empty()) + return 0; + + if (config->ekind == ELF32BEKind || config->ekind == ELF32LEKind) { + if (config->mipsN32Abi) + ret |= EF_MIPS_ABI2; + else + ret |= EF_MIPS_ABI_O32; + } + + return ret; +} + template uint32_t elf::calcMipsEFlags() { std::vector v; for (InputFile *f : objectFiles) v.push_back({f, cast>(f)->getObj().getHeader()->e_flags}); if (v.empty()) - return 0; + return getFlagsFromEmulation(); checkFlags(v); return getMiscFlags(v) | getPicFlags(v) | getArchFlags(v); }