pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/cross/xtensa-esp32-elf-gcc



Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Apr 14 00:50:00 UTC 2022

Modified Files:
        pkgsrc/cross/xtensa-esp32-elf-gcc: Makefile PLIST distinfo
Added Files:
        pkgsrc/cross/xtensa-esp32-elf-gcc: Makefile.common
        pkgsrc/cross/xtensa-esp32-elf-gcc/patches:
            patch-newlib_libc_posix_collate.c patch-newlib_libc_posix_regcomp.c
Removed Files:
        pkgsrc/cross/xtensa-esp32-elf-gcc/patches: patch-configure
            patch-contrib_download__prerequisites

Log Message:
xtensa-esp32-elf-gcc: update to GCC 8.4.0 w/ esp-2021r2-patch3

Changes unknown.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-configure \
    pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-contrib_download__prerequisites
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_collate.c \
    pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_regcomp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile
diff -u pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile:1.8 pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile:1.9
--- pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile:1.8      Mon May 24 19:49:28 2021
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile  Thu Apr 14 00:50:00 2022
@@ -1,81 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/05/24 19:49:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/14 00:50:00 tnn Exp $
 
-# We could use the upstream GCC distfile, but Espressif has important vendor
-# patches in their branch and it seems not worth the maintenance overhead to
-# extract them and put them in pkgsrc.
-# See: https://github.com/espressif/gcc/commits/esp32-2018r1_gcc-8_2_0
-#DISTNAME=             gcc-8.3.0
-#MASTER_SITES=         ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/}
-#EXTRACT_SUFX=         .tar.xz
+ESP32_TYPE=    esp32
 
-DISTNAME=              espressif-gcc-8.2.0
-PKGREVISION=           5
-PKGNAME=               ${DISTNAME:C/.*gcc/xtensa-esp32-elf-gcc/}
-CATEGORIES=            cross
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=espressif/}
-GITHUB_PROJECT=                gcc
-GITHUB_TAG=            35d9a8eb86910a6acac7579f22f8e88a92dbb251
-# Espressif overlays
-DISTFILES=             ${DEFAULT_DISTFILES}
-DISTFILES+=            crosstool-ng-esp32-2019r1.tar.gz
-SITES.crosstool-ng-esp32-2019r1.tar.gz=        \
-       -https://github.com/espressif/crosstool-NG/archive/ce035ad3351127e4fdb3ff96790caba42b9f1aa3.tar.gz
-# Custom ESP32 newlib
-DISTFILES+=            newlib-${NEWLIBVER}.tar.gz
-NEWLIBVER=             esp32-2019r1_newlib-3_0_0
-SITES.newlib-${NEWLIBVER}.tar.gz= \
-       -https://github.com/espressif/newlib-esp32/archive/46a44cc1111687d8297e35f9766493abd291e5cc.tar.gz
+.include "${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/Makefile.common"
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://github.com/espressif/gcc
-COMMENT=               Cross GCC for Espressif ESP32 bare metal environment
-LICENSE=               gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-
-DEPENDS+=      xtensa-esp32-elf-binutils-[0-9]*:../../cross/xtensa-esp32-elf-binutils
-
-GNU_CONFIGURE=         yes
-INFO_FILES=            yes
-USE_LANGUAGES+=                c c++
-USE_TOOLS+=            bash gmake makeinfo perl
-
-# for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549
-# use makeinfo from pkgsrc/devel/gtexinfo.
-TOOL_DEPENDS+=         gtexinfo>=5.1:../../devel/gtexinfo
-_TOOLS_USE_PKGSRC.makeinfo= yes
-
-OBJDIR=                        ../build
-CONFIGURE_DIRS=                ${OBJDIR}
-CONFIGURE_SCRIPT=      ${WRKSRC}/configure
-CONFIG_SHELL=          ${TOOLS_PATH.bash}
-WRAPPER_SHELL=         ${TOOLS_PATH.bash}
-GNU_CONFIGURE_PREFIX=  ${PREFIX}/xtensa-esp32-elf
-
-CONFIGURE_ARGS+=       --target=xtensa-esp32-elf
-CONFIGURE_ARGS+=       --enable-languages=c,c++
-CONFIGURE_ARGS+=       --with-newlib
-CONFIGURE_ARGS+=       --enable-multiarch
-CONFIGURE_ARGS+=       --disable-nls
-CONFIGURE_ARGS+=       --disable-libstdcxx-pch
-CONFIGURE_ARGS+=       --disable-libstdcxx-verbose
-CONFIGURE_ARGS+=       --disable-__cxa_atexit
-CONFIGURE_ARGS+=       --enable-cxx-flags="-fno-rtti -ffunction-sections -mlongcalls"
-CONFIGURE_ARGS+=       --enable-target-optspace
-CONFIGURE_ARGS+=       --disable-libquadmath
-CONFIGURE_ARGS+=       --disable-libssp
-CONFIGURE_ARGS+=       --without-long-double-128
-CONFIGURE_ARGS+=       --enable-gcov-custom-rtio
-
-CHECK_PORTABILITY_SKIP+=       contrib/*
-
-post-extract:
-       ${CP} -r ${WRKDIR}/crosstool-NG*/overlays/xtensa_esp32/gcc/. ${WRKSRC}/.
-       ${LN} -s ${WRKDIR}/newlib-*/newlib ${WRKSRC}/newlib
-       ${LN} -s ${WRKDIR}/newlib-*/libgloss ${WRKSRC}/libgloss
-
-pre-configure:
-       ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
-
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
-.include "../../math/mpcomplex/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST
diff -u pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST:1.2 pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST:1.3
--- pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST:1.2 Mon May 27 17:31:14 2019
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/PLIST     Thu Apr 14 00:50:00 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/05/27 17:31:14 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/04/14 00:50:00 tnn Exp $
 xtensa-esp32-elf/bin/xtensa-esp32-elf-c++
 xtensa-esp32-elf/bin/xtensa-esp32-elf-cpp
 xtensa-esp32-elf/bin/xtensa-esp32-elf-g++
@@ -25,6 +25,12 @@ xtensa-esp32-elf/lib/gcc/xtensa-esp32-el
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/crtn.o
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/libgcc.a
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/crtn.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/libgcc.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/esp32-psram/no-rtti/libgcov.a
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/include-fixed/README
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/include-fixed/limits.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/include-fixed/syslimits.h
@@ -51,6 +57,12 @@ xtensa-esp32-elf/lib/gcc/xtensa-esp32-el
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/install-tools/mkheaders.conf
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/libgcc.a
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/libgcov.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/crtbegin.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/crtend.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/crti.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/crtn.o
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/libgcc.a
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/no-rtti/libgcov.a
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/gtype.state
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/addresses.h
@@ -105,6 +117,7 @@ xtensa-esp32-elf/lib/gcc/xtensa-esp32-el
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/initfini-array.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/newlib-stdint.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/xtensa/elf.h
+xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/xtensa/xtensa-opts.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/xtensa/xtensa-protos.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/config/xtensa/xtensa.h
 xtensa-esp32-elf/lib/gcc/xtensa-esp32-elf/${PKGVERSION}/plugin/include/configargs.h
@@ -1256,7 +1269,53 @@ xtensa-esp32-elf/xtensa-esp32-elf/includ
 xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/bits/stdtr1c++.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/bits/time_members.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/esp32-psram/no-rtti/ext/opt_random.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/ext/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/atomic_word.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/basic_file.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/c++allocator.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/c++config.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/c++io.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/c++locale.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/cpu_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/ctype_base.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/ctype_inline.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/cxxabi_tweaks.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/error_constants.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/extc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/gthr-default.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/gthr-posix.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/gthr-single.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/gthr.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/messages_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/opt_random.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/os_defines.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/stdc++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/stdtr1c++.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/bits/time_members.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/c++/${PKGVERSION}/xtensa-esp32-elf/no-rtti/ext/opt_random.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/complex.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/config.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/cpio.h
@@ -1301,6 +1360,7 @@ xtensa-esp32-elf/xtensa-esp32-elf/includ
 xtensa-esp32-elf/xtensa-esp32-elf/include/malloc.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/math.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/memory.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/ndbm.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/newlib.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/paths.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/pthread.h
@@ -1329,6 +1389,7 @@ xtensa-esp32-elf/xtensa-esp32-elf/includ
 xtensa-esp32-elf/xtensa-esp32-elf/include/strings.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_default_fcntl.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_intsup.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_locale.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_pthreadtypes.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_sigset.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/_stdint.h
@@ -1343,6 +1404,7 @@ xtensa-esp32-elf/xtensa-esp32-elf/includ
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/errno.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/fcntl.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/features.h
+xtensa-esp32-elf/xtensa-esp32-elf/include/sys/fenv.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/file.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/iconvnls.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/sys/lock.h
@@ -1378,7 +1440,6 @@ xtensa-esp32-elf/xtensa-esp32-elf/includ
 xtensa-esp32-elf/xtensa-esp32-elf/include/wchar.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/wctype.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/wordexp.h
-xtensa-esp32-elf/xtensa-esp32-elf/include/xlocale.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/xtensa/config/core-isa.h
 xtensa-esp32-elf/xtensa-esp32-elf/lib/crt0.o
 xtensa-esp32-elf/xtensa-esp32-elf/lib/default.specs
@@ -1392,6 +1453,19 @@ xtensa-esp32-elf/xtensa-esp32-elf/lib/es
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libstdc++.a-gdb.py
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libstdc++.la
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/default.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libc.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libg.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libgloss.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libm.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libstdc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/nosys.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nosys.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libc.a
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libg.a
@@ -1401,6 +1475,19 @@ xtensa-esp32-elf/xtensa-esp32-elf/lib/li
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libstdc++.a-gdb.py
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libstdc++.la
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/default.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libc.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libg.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libgloss.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libm.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libnosys.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libstdc++.a-gdb.py
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libstdc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libsupc++.la
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/nosys.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/nosys.specs
 @pkgdir xtensa-esp32-elf/xtensa-esp32-elf/include/rpc
 @pkgdir xtensa-esp32-elf/xtensa-esp32-elf/include/bits

Index: pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo
diff -u pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo:1.5 pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo:1.6
--- pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo:1.5      Tue Oct 26 10:07:57 2021
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/distinfo  Thu Apr 14 00:50:00 2022
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:07:57 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/04/14 00:50:00 tnn Exp $
 
-BLAKE2s (crosstool-ng-esp32-2019r1.tar.gz) = bed8d08d2fc99b7b787a0e112e6e94951fdfdd067e3e0393b3cb54a61c05beec
-SHA512 (crosstool-ng-esp32-2019r1.tar.gz) = ff4dc1a31db96449ca6334296315d0edc1afdd4eef23fd0a3f8c327648f023dc732d9f25da4713d918eae764c31c6a5bea1245578185b267072f6b2b7d93c155
-Size (crosstool-ng-esp32-2019r1.tar.gz) = 2494124 bytes
-BLAKE2s (espressif-gcc-8.2.0-35d9a8eb86910a6acac7579f22f8e88a92dbb251.tar.gz) = 35463882631ffc6a5b3ba517ffc503e06928efabaef578ee2a472ee0fddedc14
-SHA512 (espressif-gcc-8.2.0-35d9a8eb86910a6acac7579f22f8e88a92dbb251.tar.gz) = 
65c30b988f22718da2a59a8161406080f35e6850111d2fdb6607e085975c2daff277b853bd24ff9856405abc24726d8e2f5caca397afd0c92f0798d03e428c29
-Size (espressif-gcc-8.2.0-35d9a8eb86910a6acac7579f22f8e88a92dbb251.tar.gz) = 102473573 bytes
-BLAKE2s (newlib-esp32-2019r1_newlib-3_0_0.tar.gz) = e689211a8bf041bf687bec3f074d74aae0dfb7578cc5215d3a9b0ad0dd7d986c
-SHA512 (newlib-esp32-2019r1_newlib-3_0_0.tar.gz) = d08ed86765d939f3d5cd42d69b9ba0c1b87e75a8e258baf2ee5fd75dbd2f298da36a7c704dd3944570fc5359292a3795f9de0aa7208baf20c013b37c3f925ff4
-Size (newlib-esp32-2019r1_newlib-3_0_0.tar.gz) = 21247297 bytes
-SHA1 (patch-configure) = e8ce6b8126845e03bbaa28569074fada93466d85
-SHA1 (patch-contrib_download__prerequisites) = be9b02068b3d4d783e92bee66d480bb2bfe35a84
+BLAKE2s (crosstool-NG-esp-2021r2-patch3.tar.gz) = 2013c2818fd818473d5a6d923108f6c80bd6b62345a1e2a835bb4ba9a5f104b7
+SHA512 (crosstool-NG-esp-2021r2-patch3.tar.gz) = 65a4c60151fb13311c21092c9b575fa29cac1beb9642ed73940c2d5fb5b11b8129b73ccfab847a02fb99d0a6b596b98d7f54c40fdcf304a2b667ca78746ed2cb
+Size (crosstool-NG-esp-2021r2-patch3.tar.gz) = 3145346 bytes
+BLAKE2s (espressif-gcc-8.4.0-f9333cfc1a790dff864aea3478cb862cc442be30.tar.gz) = bf9fb66a7c0042cfc762adf67e2c3f8df15be176d4c3f95e15dd3d75908ea970
+SHA512 (espressif-gcc-8.4.0-f9333cfc1a790dff864aea3478cb862cc442be30.tar.gz) = 
304af9506b6e69d7405eef87ca558d8467438a3bc4dfe98e1cff22a9b1250f4f72e9aa0908a157a4c1d1b21387116335de0745ba7bafb6af0fce5cee43f71be2
+Size (espressif-gcc-8.4.0-f9333cfc1a790dff864aea3478cb862cc442be30.tar.gz) = 102886468 bytes
+BLAKE2s (newlib-esp32-2021r2-patch3_newlib-3_3_0.tar.gz) = f49c5ba7d678b9d05e6eb6abf543e5fc24ca4af1ca1d172edd028fe5f9396e1c
+SHA512 (newlib-esp32-2021r2-patch3_newlib-3_3_0.tar.gz) = 24e2200b5e16db12a40ada1a03d01389214859382d06f2068a57fd4e8d87e4f74bf963e139fbfd3f24e5815ba2ead897b0ac190fc0848a1c49895ed0c8ab54ac
+Size (newlib-esp32-2021r2-patch3_newlib-3_3_0.tar.gz) = 21938580 bytes
 SHA1 (patch-gcc_system.h) = 72a75ff773b9b5f3d2f16f4ec7d29e032aba5f53
+SHA1 (patch-newlib_libc_posix_collate.c) = 2916597f1ca3b7beb2f67a457d8f448e1da8f896
+SHA1 (patch-newlib_libc_posix_regcomp.c) = acb145e6ac4a74b545ac335e034180166c20904d

Added files:

Index: pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common
diff -u /dev/null pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common:1.1
--- /dev/null   Thu Apr 14 00:50:00 2022
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common   Thu Apr 14 00:50:00 2022
@@ -0,0 +1,97 @@
+# $NetBSD: Makefile.common,v 1.1 2022/04/14 00:50:00 tnn Exp $
+
+# used by cross/xtensa-esp32-elf-gcc/Makefile
+# used by cross/xtensa-esp32s2-elf-gcc/Makefile
+# used by cross/xtensa-esp32s3-elf-gcc/Makefile
+
+# We could use the upstream GCC distfile, but Espressif has important vendor
+# patches in their branch and it seems not worth the maintenance overhead to
+# extract them and put them in pkgsrc.
+#DISTNAME=             gcc-8.3.0
+#MASTER_SITES=         ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/}
+#EXTRACT_SUFX=         .tar.xz
+
+DISTNAME=              espressif-gcc-8.4.0
+PKGNAME=               ${DISTNAME:C/.*gcc/xtensa-${ESP32_TYPE}-elf-gcc/}
+CATEGORIES=            cross
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=espressif/}
+GITHUB_PROJECT=                gcc
+GITHUB_TAG=            f9333cfc1a790dff864aea3478cb862cc442be30
+# Espressif overlays
+DISTFILES=             ${DEFAULT_DISTFILES}
+DISTFILES+=            crosstool-NG-esp-2021r2-patch3.tar.gz
+SITES.crosstool-NG-esp-2021r2-patch3.tar.gz=   \
+       -https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/crosstool-NG-esp-2021r2-patch3.tar.gz
+# Custom ESP32 newlib
+DISTFILES+=            newlib-${NEWLIBVER}.tar.gz
+NEWLIBVER=             esp32-2021r2-patch3_newlib-3_3_0
+SITES.newlib-${NEWLIBVER}.tar.gz= \
+       -https://github.com/espressif/newlib-esp32/archive/8a3197a2a9a42dd99605cf8cc1e0f2d3c976c58c.tar.gz
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              https://github.com/espressif/gcc
+COMMENT=               Cross GCC for Espressif ${ESP32_TYPE:tu} bare metal environment
+LICENSE=               gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+
+DEPENDS+=      xtensa-${ESP32_TYPE}-elf-binutils>=2.35.2:../../cross/xtensa-${ESP32_TYPE}-elf-binutils
+
+GNU_CONFIGURE=         yes
+INFO_FILES=            yes
+USE_LANGUAGES+=                c c++
+USE_TOOLS+=            bash gmake makeinfo perl
+
+PATCHDIR=      ${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/patches
+DISTINFO_FILE= ${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/distinfo
+DESCR_SRC=     ${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/DESCR
+
+# for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549
+# use makeinfo from pkgsrc/devel/gtexinfo.
+TOOL_DEPENDS+=         gtexinfo>=5.1:../../devel/gtexinfo
+_TOOLS_USE_PKGSRC.makeinfo= yes
+
+OBJDIR=                        ../build
+CONFIGURE_DIRS=                ${OBJDIR}
+CONFIGURE_SCRIPT=      ${WRKSRC}/configure
+CONFIG_SHELL=          ${TOOLS_PATH.bash}
+WRAPPER_SHELL=         ${TOOLS_PATH.bash}
+GNU_CONFIGURE_PREFIX=  ${PREFIX}/xtensa-${ESP32_TYPE}-elf
+
+# This is based on "gcc -v" output from the binary release
+# xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz
+CONFIGURE_ARGS+=       --target=xtensa-${ESP32_TYPE}-elf
+CONFIGURE_ARGS+=       --with-newlib
+CONFIGURE_ARGS+=       --enable-threads=no
+CONFIGURE_ARGS+=       --disable-shared
+CONFIGURE_ARGS+=       --disable-__cxa_atexit
+CONFIGURE_ARGS+=       --enable-cxx-flags="-ffunction-sections"
+CONFIGURE_ARGS+=       --disable-libgomp
+CONFIGURE_ARGS+=       --disable-libmudflap
+CONFIGURE_ARGS+=       --disable-libmpx
+CONFIGURE_ARGS+=       --disable-libssp
+CONFIGURE_ARGS+=       --disable-libquadmath
+CONFIGURE_ARGS+=       --disable-libquadmath-support
+CONFIGURE_ARGS+=       --enable-lto
+CONFIGURE_ARGS+=       --enable-target-optspace
+CONFIGURE_ARGS+=       --without-long-double-128
+CONFIGURE_ARGS+=       --disable-nls
+CONFIGURE_ARGS+=       --enable-multiarch
+CONFIGURE_ARGS+=       --enable-languages=c,c++
+CONFIGURE_ARGS+=       --disable-libstdcxx-verbose
+CONFIGURE_ARGS+=       --enable-threads=posix
+CONFIGURE_ARGS+=       --enable-gcov-custom-rtio
+CONFIGURE_ARGS+=       --enable-libstdcxx-time=yes
+
+CHECK_PORTABILITY_SKIP+=       contrib/*
+
+post-extract:
+       mv ${WRKDIR}/newlib-*/newlib ${WRKSRC}/newlib
+       mv ${WRKDIR}/newlib-*/libgloss ${WRKSRC}/libgloss
+       ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/gcc/. ${WRKSRC}/.
+       ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/newlib/. ${WRKSRC}/.
+
+pre-configure:
+       ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../math/mpcomplex/buildlink3.mk"

Index: pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_collate.c
diff -u /dev/null pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_collate.c:1.1
--- /dev/null   Thu Apr 14 00:50:00 2022
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_collate.c Thu Apr 14 00:50:00 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-newlib_libc_posix_collate.c,v 1.1 2022/04/14 00:50:00 tnn Exp $
+
+work around a problem where PATH_MAX is undefined
+
+--- newlib/libc/posix/collate.c.orig   2022-03-31 06:25:20.000000000 +0000
++++ newlib/libc/posix/collate.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <sys/cdefs.h>
++#include "../include/limits.h"
+ 
+ #include "namespace.h"
+ #include <rune.h>
Index: pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_regcomp.c
diff -u /dev/null pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_regcomp.c:1.1
--- /dev/null   Thu Apr 14 00:50:00 2022
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/patches/patch-newlib_libc_posix_regcomp.c Thu Apr 14 00:50:00 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-newlib_libc_posix_regcomp.c,v 1.1 2022/04/14 00:50:00 tnn Exp $
+
+work around a problem where _POSIX2_RE_DUP_MAX is undefined
+
+--- newlib/libc/posix/regcomp.c.orig   2022-03-31 06:25:20.000000000 +0000
++++ newlib/libc/posix/regcomp.c
+@@ -39,6 +39,7 @@
+ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
+ #endif /* LIBC_SCCS and not lint */
+ #include <sys/cdefs.h>
++#include "../include/limits.h"
+ 
+ #include <sys/types.h>
+ #include <stdio.h>



Home | Main Index | Thread Index | Old Index