From nobody Fri May 20 17:14:29 2022 X-Original-To: dev-commits-ports-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 5EE451B343B2; Fri, 20 May 2022 17:14:29 +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 4L4YHT27wBz4hv2; Fri, 20 May 2022 17:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066869; 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=9mz5BDiN8G+7V1hJ4EiiYjbPUVBds1j1lW0fNPMgHE0=; b=wixlB66VIFFBUFYtZlmoMTh+c+8hjSzFznVzWRSEW7ViuBgp7KVYoZG83p2oV6cTUp8VUJ fvRSxDmU7h5JTM/hXEfVvZn9d+vb30kUNs5Z5236uenJ8XhfEVKH0Df9+CbjTHou/uJdvP yTGRdEAS2BcaESgNyaPEAJx6bfQjsfm8njcqZUIX/TV8WtZuSiBtrXNB5qNz12IfqlsHdz TBOtI74GJOaPGcTIYl0+aHjE/l2ShnlnAIP8DtBGDlhPLYCC5M5JH4A00+fGZSlRnHsMAc xpJ10h1lhH8xDu8ZGmThYoX9zD+SZLehyLszQdOO8XsWtQCJUHpDbNAsjrbWlg== 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 2523916273; Fri, 20 May 2022 17:14:29 +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 24KHET2b044372; Fri, 20 May 2022 17:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KHET6S044371; Fri, 20 May 2022 17:14:29 GMT (envelope-from git) Date: Fri, 20 May 2022 17:14:29 GMT Message-Id: <202205201714.24KHET6S044371@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: e28fe2856c58 - main - devel/freebsd-gcc9: Add flavors for armv6 and armv7. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e28fe2856c588c82752fef2becbb2a43709aab42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653066869; 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=9mz5BDiN8G+7V1hJ4EiiYjbPUVBds1j1lW0fNPMgHE0=; b=kRXojVWWYNhjHsqifOfJO8VITaIaQYC2xxlZt/0+g75EAcsWxJYbJwu9DAzMYERssOSpu+ mX5BaljlmcMFNlaITvpywI7YzWRSvmAKTZYPrZaDwsfNBCb3gI1ZHTzK0uOoXhjWAS+fJJ 2ojnzmP9KvTzHH7WI9W2+RjvVUdqEDpRM2uoEbpozbMz5YtItxm2TxwshE3rDrHhugrwyE bydYuAz/eZTjbbg5kDfgWFaGxXQjX6POzyJZX4YyYeMos527fKhqhznBd6sm5j1ikqd1m1 jZP0CDVXfkcJXwftC1ELF3xG07mQGsDmXlNyBt8iSg++MOhb8v69LExi+rB6hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653066869; a=rsa-sha256; cv=none; b=mGu25/H8ytXNL/LD0sQmFEFUjIJh3QxJ5uVHg0dLyRvNrF0e9BuXtXqFfc+0PZOuj+OqSr lElGzY+OFTFK+Uvr+dO3Ye94oqEYID7uA9QJU7Z/rZcN+XjCvmgAdzPTBcDkjm8vg9RqOU 1rUx+ov997YS5q1RycovhoQvBmgGSPA9PoXri2yXKO1OBWdYyqh2+9S55HtXTfAQ55d2Tq h7EUPSigRdZtyeSvbHsqo6HBEGMmZJXirRD/slg57ZKn8HbjF2/WmSVsOt2M87P0qafDxV Q1akmMlwFiQ4gFhLrd4FJgjKZahW2IRRo/eCBhyNUIo3bw/xBoO0Xx10mo1XFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=e28fe2856c588c82752fef2becbb2a43709aab42 commit e28fe2856c588c82752fef2becbb2a43709aab42 Author: John Baldwin AuthorDate: 2022-05-20 17:08:04 +0000 Commit: John Baldwin CommitDate: 2022-05-20 17:08:04 +0000 devel/freebsd-gcc9: Add flavors for armv6 and armv7. These build GCC compilers for the armv6 and armv7 architectures suitable for use with CROSS_TOOLCHAIN. These toolchains use the existing arm_gnueabi flavor of binutils. Differential Revision: https://reviews.freebsd.org/D35110 --- devel/freebsd-gcc9/Makefile | 27 ++++++++++++++++++++------- devel/freebsd-gcc9/files/xtoolchain.mk.in | 2 +- devel/freebsd-gcc9/pkg-plist.arm_gnueabi | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile index 0ba517e1c288..32a202748df3 100644 --- a/devel/freebsd-gcc9/Makefile +++ b/devel/freebsd-gcc9/Makefile @@ -12,14 +12,14 @@ COMMENT= Cross GNU Compiler Collection for ${TARGETARCH} LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \ +BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \ objdump:devel/binutils LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} +RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} -FLAVORS= aarch64 amd64 i386 mips mips64 powerpc powerpc64 riscv64 sparc64 +FLAVORS= aarch64 amd64 armv6 armv7 i386 mips mips64 powerpc powerpc64 riscv64 sparc64 TARGETARCH= ${FLAVOR} USES= compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz @@ -32,12 +32,11 @@ PLIST_SUB= OPSYS=${OPSYS:tl} \ GCC_VERSION=${PORTVERSION} SUB_FILES= xtoolchain.mk -SUB_LIST= GCC_TARGET=${GCC_TARGET} \ +SUB_LIST= BU_PREFIX=${BU_PREFIX} \ + GCC_TARGET=${GCC_TARGET} \ SUFFIX=${SUFFIX} -GCC_TARGET= ${FLAVOR:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -BU_PREFIX= ${GCC_TARGET} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes @@ -60,6 +59,17 @@ INSTALL_TARGET= install-gcc .include +.if ${TARGETARCH:Marm*} +TARGET_ABI= gnueabi +BU_FLAVOR= arm_${TARGET_ABI} +BU_PREFIX= arm-${TARGET_ABI}-${OPSYS:tl}${OSREL} +.else +TARGET_ABI= unknown +BU_FLAVOR= ${TARGETARCH} +BU_PREFIX= ${GCC_TARGET} +.endif +GCC_TARGET= ${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL} + post-patch: @${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \ ${WRKSRC}//gcc/cp/g++spec.c @@ -72,7 +82,7 @@ CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL} CONFIGURE_TARGET= ${ARCH}-unknown-${OPSYS:tl}${OSREL} .endif -.if ${TARGETARCH} == "armv6" || ${TARGETARCH} == "aarch64" +.if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64" . if ${COMPILER_TYPE} == clang MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512 . endif @@ -102,6 +112,9 @@ PLIST+= ${.CURDIR}/pkg-plist.aarch64 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*} PLIST+= ${.CURDIR}/pkg-plist.arm .endif +.if ${TARGETARCH:Marm*} +PLIST+= ${.CURDIR}/pkg-plist.arm_gnueabi +.endif .if ${TARGETARCH} == "amd64" PLIST+= ${.CURDIR}/pkg-plist.amd64 .endif diff --git a/devel/freebsd-gcc9/files/xtoolchain.mk.in b/devel/freebsd-gcc9/files/xtoolchain.mk.in index afdb4a198c86..7cacd42f1609 100644 --- a/devel/freebsd-gcc9/files/xtoolchain.mk.in +++ b/devel/freebsd-gcc9/files/xtoolchain.mk.in @@ -1,5 +1,5 @@ XCC=%%LOCALBASE%%/bin/%%GCC_TARGET%%-gcc%%SUFFIX%% XCXX=%%LOCALBASE%%/bin/%%GCC_TARGET%%-g++%%SUFFIX%% XCPP=%%LOCALBASE%%/bin/%%GCC_TARGET%%-cpp%%SUFFIX%% -CROSS_BINUTILS_PREFIX=%%LOCALBASE%%/%%GCC_TARGET%%/bin/ +CROSS_BINUTILS_PREFIX=%%LOCALBASE%%/%%BU_PREFIX%%/bin/ X_COMPILER_TYPE=gcc diff --git a/devel/freebsd-gcc9/pkg-plist.arm_gnueabi b/devel/freebsd-gcc9/pkg-plist.arm_gnueabi new file mode 100644 index 000000000000..f2fd8dcb095b --- /dev/null +++ b/devel/freebsd-gcc9/pkg-plist.arm_gnueabi @@ -0,0 +1,14 @@ +lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_cmse.h +lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mmintrin.h +lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/unwind-arm-common.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/arm-cpu.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/arm-isa.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/aout.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/arm-flags.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/arm-opts.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/arm-protos.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/arm.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/bpabi.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/elf.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/%%OPSYS%%.h +%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h