From nobody Sat Aug 12 04:55:36 2023 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 4RN7dh3hX7z4Tn3n; Sat, 12 Aug 2023 04:55:36 +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 4RN7dh2lrlz3Mxp; Sat, 12 Aug 2023 04:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816136; 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=GUlgYxd/9tCeqZ64/hdUV1rLa6L6NI5y5McnQlPRyqY=; b=Nhe6sy6x+qy9QC52Yqg956RgCf4zQgDDOC9qgBYx1OOqqJIZ+dzQYkUjzo66o4KwG47xqz lVaoIxetT/88ZcpLr0MW5QxCJvglK5F7ocakr+nASZdIJsEuzj3ZXb7qroCp7aMjKqJvVH TO2hpP0GnSNswUaJIEXNIDrbhjGulViP0BBwVcuDwWsaNpw2YRWLSsCk8byAKCFcc9arQa +pWBuJhsTx741EalHgPJjaSK5BPhyiET/rKC09+8ukemodUKlOXPFSND9qdTbr8pauRe6p dGom+nnXoHJETrQUgIWdVw+PCi4DtJ19S461puUtmzcEII9sWt0mV5J8WSB1Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816136; 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=GUlgYxd/9tCeqZ64/hdUV1rLa6L6NI5y5McnQlPRyqY=; b=rbvy3Zvf385IOH5Y8S9dPtSHu7K0AcR/u/aAyAu01WxU0cxzFiAoZz8H3kAjQCyGEO7Mw+ U+n80SMXQ1Ms0bz8whPhv61MGWYaiHXHLE+SYWIPtbeXm1QTq9+NhKJffx6aIEII7Rk4v2 lRUToWff8QO0Ntvnu4LqWfkDHYFjggQNmTexlMD+/aoVyBZeu1Pn0q+NoNMWtM0PaYaqvJ SW64jv+SaymDf4km2lHCBgo72A3Gvb0PHVdEYc95SN15L79/yl9oRCeEDDsF41laQXZzJZ XgjVVI7cA2OTRCMccZvYWK8Hnr3NFXS56bwEtZIEcST5Dbuv5kpRMdiZGoYLEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816136; a=rsa-sha256; cv=none; b=fLYrAisxhbyd16w5F18qDOO6jSDcA+n5CgbTgUB+ZI0zU6u868M/CL+BhGHMniVqJ2hQgb LsIyZ/EJnXW4AgjrCa98r0DHHV3rRHI2uxWJncrj048EHXyo6mdEin2/tei3LDyva3duhS aGUjY8rV8ncRIklIn0uJIOLPvb5qXAus2nEr+D98nKUJvZQdHZeA8EJRse0oSZ1udkkx1h 4ka39W+n6g8mQYl3s2uTq0QqGVPGBVuSro9JsAQkr7mVKp7TnSfsdQeiy9zPZTKoEPIblP dHNHbkogBUE3VlXN6AnCMS/Bn3hR+TRJKpksJEjRG0wGGmaM++TKiWA1SkiO9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RN7dh1YQtz16V7; Sat, 12 Aug 2023 04:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4taJW074477; Sat, 12 Aug 2023 04:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4ta61074474; Sat, 12 Aug 2023 04:55:36 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:36 GMT Message-Id: <202308120455.37C4ta61074474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0bc26e325450 - main - clang: Minor build simplification now that armv[45] is not supported 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bc26e32545069586676149efcafae98c3e3dea3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bc26e32545069586676149efcafae98c3e3dea3 commit 0bc26e32545069586676149efcafae98c3e3dea3 Author: Warner Losh AuthorDate: 2022-07-05 16:19:32 +0000 Commit: Warner Losh CommitDate: 2023-08-12 04:55:10 +0000 clang: Minor build simplification now that armv[45] is not supported Simplify these expressions a little and remove an obsolete comment. Sponsored by: Netflix --- lib/clang/llvm.build.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 666dff08c222..f9fd62e78f4e 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -38,12 +38,13 @@ TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. -# arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. -.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") -TARGET_TRIPLE_ABI= -gnueabihf -.elif ${TARGET_ARCH:Marm*} -TARGET_TRIPLE_ABI= -gnueabi +.if ${TARGET_ARCH:Marm*} +.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "" +TARGET_ABI= -gnueabihf +.else +TARGET_ABI= -gnueabi +.endif .else TARGET_TRIPLE_ABI= .endif