Hello, This diff brings our xtensa-esp32-elf to version 8.4.0. It also adjusts the COMPILER to base-clang ports-clang, which fixes the build on sparc64. This has also been tested in a bulk build by kmos@ (thanks) with no issue.
I've tested this out to chip on both sparc64 and amd64 without issues. Ok to commit? -- Tracey Emery Index: Makefile.inc =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/Makefile.inc,v retrieving revision 1.2 diff -u -p -u -r1.2 Makefile.inc --- Makefile.inc 30 Mar 2020 19:24:41 -0000 1.2 +++ Makefile.inc 19 Oct 2020 14:14:04 -0000 @@ -1,7 +1,5 @@ # $OpenBSD: Makefile.inc,v 1.2 2020/03/30 19:24:41 tracey Exp $ -BROKEN-sparc64 = 'in gcc-bootsrap build/genmodes -h > tmp-modes.h' 'Illegal instruction (core dumped)' - CONFIG = xtensa-esp32-elf CATEGORIES += devel HOMEPAGE = https://www.espressif.com/en/products/software/esp-sdk/overview @@ -10,6 +8,9 @@ HOMEPAGE = https://www.espressif.com/en/ # For newlib: multiple copyrights, but basically BSD. # See: ${PREFIX}/share/doc/newlib PERMIT_PACKAGE = Yes + +# permits build on sparc64 +COMPILER = base-clang ports-clang # XXX at least gmkdir gets picked up if present BUILD_DEPENDS += sysutils/coreutils Index: binutils/Makefile =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 Makefile --- binutils/Makefile 11 Mar 2020 14:24:57 -0000 1.1.1.1 +++ binutils/Makefile 19 Oct 2020 14:14:04 -0000 @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.1.1.1 2020/03/11 14:24:57 tracey Exp $ COMMENT = binutils for ${CONFIG} cross-development -VERSION = 2.33.1.2019.2 +VERSION = 2.33.1.2020.3 PKGNAME = ${CONFIG}-binutils-${VERSION} GH_ACCOUNT = espressif GH_PROJECT = binutils-gdb -GH_TAGNAME = esp-2019r2-binutils +GH_TAGNAME = esp-2020r3-binutils WANTLIB = c z Index: binutils/distinfo =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/binutils/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- binutils/distinfo 11 Mar 2020 14:24:57 -0000 1.1.1.1 +++ binutils/distinfo 19 Oct 2020 14:14:04 -0000 @@ -1,2 +1,2 @@ -SHA256 (binutils-gdb-esp-2019r2-binutils.tar.gz) = UqzyNZgUlYfPYlICMfhqOVz96sKFrYFkn+EXNBfumpU= -SIZE (binutils-gdb-esp-2019r2-binutils.tar.gz) = 55972591 +SHA256 (binutils-gdb-esp-2020r3-binutils.tar.gz) = IK7F3R6RSuzIv3kqeQ2ZFLwfklpZaWolxJY0qZAB+dM= +SIZE (binutils-gdb-esp-2020r3-binutils.tar.gz) = 55967670 Index: gcc/Makefile =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 Makefile --- gcc/Makefile 11 Mar 2020 14:24:57 -0000 1.1.1.1 +++ gcc/Makefile 19 Oct 2020 14:14:05 -0000 @@ -2,19 +2,17 @@ COMMENT = gcc for ${CONFIG} cross-development -V = 8.2.0 -VERSION = 8.2.0.2019.2 +V = 8.4.0 +VERSION = 8.4.0.2020.3 PKGNAME = ${CONFIG}-gcc-${VERSION} GH_ACCOUNT = espressif GH_PROJECT = gcc -GH_TAGNAME = esp-2019r2 +GH_TAGNAME = esp-2020r3 SUBST_VARS += V WANTLIB = ${COMPILER_LIBCXX} c gmp m mpc mpfr z - -COMPILER = base-clang ports-gcc base-gcc BUILD_DEPENDS += devel/bison \ devel/${CONFIG}/binutils \ Index: gcc/distinfo =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- gcc/distinfo 11 Mar 2020 14:24:57 -0000 1.1.1.1 +++ gcc/distinfo 19 Oct 2020 14:14:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (gcc-esp-2019r2.tar.gz) = vDLoY5pasPpzDwLi4sA7Mtvxyu4POCzulaFHC2TlZMI= -SIZE (gcc-esp-2019r2.tar.gz) = 102451518 +SHA256 (gcc-esp-2020r3.tar.gz) = qdZraISIoiXG6O5po3YR9G0M3M+bj5tCYBKmihK4xHs= +SIZE (gcc-esp-2020r3.tar.gz) = 102866867 Index: gcc/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 PLIST --- gcc/pkg/PLIST 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ gcc/pkg/PLIST 19 Oct 2020 14:14:05 -0000 @@ -134,6 +134,7 @@ lib/gcc/xtensa-esp32-elf/${V}/plugin/inc lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/newlib-stdint.h lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/ lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/elf.h +lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-opts.h lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-protos.h lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa.h lib/gcc/xtensa-esp32-elf/${V}/plugin/include/configargs.h Index: gcc-bootstrap/Makefile =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/Makefile,v retrieving revision 1.3 diff -u -p -u -r1.3 Makefile --- gcc-bootstrap/Makefile 30 Mar 2020 19:24:41 -0000 1.3 +++ gcc-bootstrap/Makefile 19 Oct 2020 14:14:05 -0000 @@ -2,20 +2,18 @@ COMMENT = bootstrap compiler for ${CONFIG} cross-development -V = 8.2.0 -VERSION = 8.2.0.2019.2 +V = 8.4.0 +VERSION = 8.4.0.2020.3 PKGNAME = ${CONFIG}-gcc-bootstrap-${VERSION} GH_ACCOUNT = espressif GH_PROJECT = gcc -GH_TAGNAME = esp-2019r2 +GH_TAGNAME = esp-2020r3 SUBST_VARS += V WANTLIB = ${COMPILER_LIBCXX} c gmp m mpc mpfr -COMPILER = base-clang ports-gcc base-gcc - BUILD_DEPENDS += devel/bison \ devel/${CONFIG}/binutils RUN_DEPENDS = devel/${CONFIG}/binutils @@ -24,6 +22,7 @@ LIB_DEPENDS = devel/gmp \ devel/libmpc YACC = bison +DEBUG_PACKAGES = ${BUILD_PACKAGES} CONFIGURE_ARGS += --exec-prefix=${LOCALBASE}/${CONFIG}/bootstrap \ --with-local-prefix=${LOCALBASE}/${CONFIG} \ Index: gcc-bootstrap/distinfo =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- gcc-bootstrap/distinfo 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ gcc-bootstrap/distinfo 19 Oct 2020 14:14:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (gcc-esp-2019r2.tar.gz) = vDLoY5pasPpzDwLi4sA7Mtvxyu4POCzulaFHC2TlZMI= -SIZE (gcc-esp-2019r2.tar.gz) = 102451518 +SHA256 (gcc-esp-2020r3.tar.gz) = qdZraISIoiXG6O5po3YR9G0M3M+bj5tCYBKmihK4xHs= +SIZE (gcc-esp-2020r3.tar.gz) = 102866867 Index: gcc-bootstrap/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gcc-bootstrap/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 PLIST --- gcc-bootstrap/pkg/PLIST 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ gcc-bootstrap/pkg/PLIST 19 Oct 2020 14:14:05 -0000 @@ -143,6 +143,7 @@ xtensa-esp32-elf/bootstrap/lib/gcc/xtens xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/newlib-stdint.h xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/ xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/elf.h +xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-opts.h xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa-protos.h xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/config/xtensa/xtensa.h xtensa-esp32-elf/bootstrap/lib/gcc/xtensa-esp32-elf/${V}/plugin/include/configargs.h Index: gdb/Makefile =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 Makefile --- gdb/Makefile 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ gdb/Makefile 19 Oct 2020 14:14:05 -0000 @@ -2,16 +2,14 @@ COMMENT = gdb for ${CONFIG} cross-development -VERSION = 2.33.1.2019.2 +VERSION = 2.33.1.2020.3 PKGNAME = ${CONFIG}-gdb-${VERSION} GH_ACCOUNT = espressif GH_PROJECT = binutils-gdb -GH_TAGNAME = esp-2019r2-gdb +GH_TAGNAME = esp-2020r3-gdb WANTLIB = c curses expat ${COMPILER_LIBCXX} gmp m mpfr - -COMPILER = base-clang ports-gcc base-gcc BUILD_DEPENDS = devel/libtool \ devel/bison \ Index: gdb/distinfo =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/gdb/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- gdb/distinfo 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ gdb/distinfo 19 Oct 2020 14:14:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (binutils-gdb-esp-2019r2-gdb.tar.gz) = bb+40vdKtp9zv1mx/CcJi2Ch24Rq46/fqluhImPyVJE= -SIZE (binutils-gdb-esp-2019r2-gdb.tar.gz) = 55159444 +SHA256 (binutils-gdb-esp-2020r3-gdb.tar.gz) = P+xCsHGa5hwOYhQEQ6owxxKPDIoCL5muwx9by+dBRZ4= +SIZE (binutils-gdb-esp-2020r3-gdb.tar.gz) = 55159670 Index: newlib/Makefile =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/Makefile,v retrieving revision 1.2 diff -u -p -u -r1.2 Makefile --- newlib/Makefile 6 Apr 2020 06:21:01 -0000 1.2 +++ newlib/Makefile 19 Oct 2020 14:14:05 -0000 @@ -2,13 +2,12 @@ COMMENT = newlib for ${CONFIG} cross-development -VERSION = 2019.2 +VERSION = 2020.3 PKGNAME = ${CONFIG}-newlib-${VERSION} -REVISION = 0 GH_ACCOUNT = espressif GH_PROJECT = newlib-esp32 -GH_TAGNAME = esp-2019r2 +GH_TAGNAME = esp-2020r3 BUILD_DEPENDS = devel/${CONFIG}/binutils \ devel/${CONFIG}/gcc-bootstrap Index: newlib/distinfo =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 distinfo --- newlib/distinfo 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ newlib/distinfo 19 Oct 2020 14:14:05 -0000 @@ -1,2 +1,2 @@ -SHA256 (newlib-esp32-esp-2019r2.tar.gz) = 63R6b7hXYBpJ32F7KwlLQ6xkQyDKHlyLMRg16u1YoF4= -SIZE (newlib-esp32-esp-2019r2.tar.gz) = 21227903 +SHA256 (newlib-esp32-esp-2020r3.tar.gz) = 5kz0WIKsTOm0mdGVeui9VjbcIfNtnwVZj+URmrGbgRw= +SIZE (newlib-esp32-esp-2020r3.tar.gz) = 21229339 Index: newlib/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/xtensa-esp32-elf/newlib/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 PLIST --- newlib/pkg/PLIST 11 Mar 2020 14:24:58 -0000 1.1.1.1 +++ newlib/pkg/PLIST 19 Oct 2020 14:14:05 -0000 @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2020/03/11 14:24:58 tracey Exp $ +xtensa-esp32-elf/ xtensa-esp32-elf/include/ xtensa-esp32-elf/include/_ansi.h xtensa-esp32-elf/include/_newlib_version.h @@ -148,6 +149,7 @@ xtensa-esp32-elf/lib/esp32-psram/default @static-lib xtensa-esp32-elf/lib/esp32-psram/libgloss.a @static-lib xtensa-esp32-elf/lib/esp32-psram/libm.a @static-lib xtensa-esp32-elf/lib/esp32-psram/libnosys.a +xtensa-esp32-elf/lib/esp32-psram/nano.specs xtensa-esp32-elf/lib/esp32-psram/no-rtti/ xtensa-esp32-elf/lib/esp32-psram/no-rtti/crt0.o xtensa-esp32-elf/lib/esp32-psram/no-rtti/default.specs @@ -156,6 +158,7 @@ xtensa-esp32-elf/lib/esp32-psram/no-rtti @static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libgloss.a @static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libm.a @static-lib xtensa-esp32-elf/lib/esp32-psram/no-rtti/libnosys.a +xtensa-esp32-elf/lib/esp32-psram/no-rtti/nano.specs xtensa-esp32-elf/lib/esp32-psram/no-rtti/nosys.specs xtensa-esp32-elf/lib/esp32-psram/nosys.specs @static-lib xtensa-esp32-elf/lib/libc.a @@ -163,6 +166,7 @@ xtensa-esp32-elf/lib/esp32-psram/nosys.s @static-lib xtensa-esp32-elf/lib/libgloss.a @static-lib xtensa-esp32-elf/lib/libm.a @static-lib xtensa-esp32-elf/lib/libnosys.a +xtensa-esp32-elf/lib/nano.specs xtensa-esp32-elf/lib/no-rtti/ xtensa-esp32-elf/lib/no-rtti/crt0.o xtensa-esp32-elf/lib/no-rtti/default.specs @@ -171,5 +175,6 @@ xtensa-esp32-elf/lib/no-rtti/default.spe @static-lib xtensa-esp32-elf/lib/no-rtti/libgloss.a @static-lib xtensa-esp32-elf/lib/no-rtti/libm.a @static-lib xtensa-esp32-elf/lib/no-rtti/libnosys.a +xtensa-esp32-elf/lib/no-rtti/nano.specs xtensa-esp32-elf/lib/no-rtti/nosys.specs xtensa-esp32-elf/lib/nosys.specs
