From nobody Wed Mar 29 22:07:19 2023 X-Original-To: dev-commits-src-main@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 4Pn0yv4cZbz41xTl; Wed, 29 Mar 2023 22:07:19 +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 4Pn0yv2pFWz3xNS; Wed, 29 Mar 2023 22:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127639; 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=cRNqENyAppFTqjoDdOKOMOLY785ZQHl+2imSD41iXs8=; b=NGDWT4T4QTLEv+12qWrzDNfsA6lSVOnfbnLnWrJ1JwPVWwFyVkRte2Ky0HDjNN0ts5ZpSA kTpICZO5YVn3D8sWSAalIeBEdnXQxqqDBJfG1d9Tku+nUpnjdRVbhTKKS1t7n3YNNr38Kq NjjiMcWA2crPstkDCXNMaP+1USdcnCF5qhLo5d8Gm8rfUbYFWgz+igf2KXw8QXuZ+7z5dM nZkBIEZSxi+F70NQ44C5/jHB9J3RVaHLHCe/cCIQxljKRtRL6TwThEmr2nsIVldKR3GVh/ 1il761mH0I5/hu2Ecth0ng76VgpapYTPTHUkbHDzfve4oQL9JGphnKaJYMeSsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127639; 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=cRNqENyAppFTqjoDdOKOMOLY785ZQHl+2imSD41iXs8=; b=m/0TwCP4AeFIja5oFYzSdS1UmNGYv5HiRR+7nTAk6AeKsfyU4jEzAW9ocvACmCb56JUC36 kOUpsKv3bQcZra0txODKBlFfWpWsqx/Tn6JzWOg4rvIiXKMgAXLT1IQyE4AWbfqCxBQVF1 MkbEQekOgPefQ1k3cJlBvtVvZLc5Dhd6bHbpmfgItCeviSAssY1GK4DbsYUij6BMygXzQQ zWjzt87HrgpB71uOZGghUUAWcD2IFo36UOTBckA62plXdpG3IlEi4rWYXStphi8Ndiac1P ARjp+AA9SXDwUuDvFP0dK154HQ3CutJM/2mr3Lrz3gnZTzKhPziup3tOnpdUFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127639; a=rsa-sha256; cv=none; b=lFTkqM/PVBS3cLk2Rq917J7KanZ9JwujGHJxsDPXmR/Hz59XX/DZwnVZm2riAnz89W+gXV ZT8KWGnjhKpLPc9ygSrcKxKI/sYajcF+JiBOp0/iVZRMuUQ235scuZJijqKHngu6Mh4vC5 B/1L/8hIKHlgC+oYKaYHuJTvBknWiboi4zQidc0yvU9Lq1U8mM+O79BCaWPm1Nj8PZM4en ZziLCSlfVcj/0E+KKrQ5hIAMem+t8x4SrS0aZ2JheRfEGO1TSPPrjhqaqSE916cehs6PSd MEfb2sfHsKm5BI1Yi+vYxikf7oDx/WhfnsvDSHcctk2jtB1SuyegDJMt3oJtgA== 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 4Pn0yv1c9jzmfY; Wed, 29 Mar 2023 22:07:19 +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 32TM7J2S050738; Wed, 29 Mar 2023 22:07:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7JG7050737; Wed, 29 Mar 2023 22:07:19 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:19 GMT Message-Id: <202303292207.32TM7JG7050737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: eeedaefab5ef - main - Remove LLVM build glue for MIPS as a native architecture. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eeedaefab5ef689abf03df2e8a273be0a5595d84 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eeedaefab5ef689abf03df2e8a273be0a5595d84 commit eeedaefab5ef689abf03df2e8a273be0a5595d84 Author: John Baldwin AuthorDate: 2023-03-29 22:06:15 +0000 Commit: John Baldwin CommitDate: 2023-03-29 22:06:15 +0000 Remove LLVM build glue for MIPS as a native architecture. This does not remove LLVM_TARGET_MIPS. Note that the only MACHINE_ARCH values ending in 'hf' were all MIPS architectures, hence removing the pattern matches for 'hf'. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39331 --- lib/clang/llvm.build.mk | 12 ++---------- share/mk/src.opts.mk | 2 +- usr.bin/clang/Makefile.inc | 5 ----- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 575b6b2d9c62..d958a4becc63 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} -LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" @@ -73,9 +73,6 @@ CFLAGS+= -DLLVM_TARGET_ENABLE_BPF .endif .if ${MK_LLVM_TARGET_MIPS} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_MIPS -. if ${MACHINE_CPUARCH} == "mips" -LLVM_NATIVE_ARCH= Mips -. endif .endif .if ${MK_LLVM_TARGET_POWERPC} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_POWERPC @@ -126,8 +123,3 @@ CFLAGS+= -DBOOTSTRAPPING_WANT_NATIVE_SYSCTL .if defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Linux" LIBADD+= dl .endif - -.if ${MACHINE_ARCH:Mmips64} -STATIC_CFLAGS+= -mxgot -STATIC_CXXFLAGS+= -mxgot -.endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c0491d6e8769..8032284d964e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -263,7 +263,7 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/:C/mips.*/mips/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support .if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index a257b795b7af..ba32f0c1032d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -12,9 +12,4 @@ DEBUG_FILES_CFLAGS= -gline-tables-only DEBUG_FILES_CFLAGS= -g1 .endif -.if ${MACHINE_ARCH:Mmips*} && ${MACHINE_ARCH:Mmips64*} == "" -CFLAGS+= -mxgot -CXXFLAGS+= -mxgot -.endif - .include "../Makefile.inc"