xtensa-esp32-elf-gcc: configure newlib closer to how espressif does

8 files changed, 210 insertions, 14 deletions

diff --git a/cross/xtensa-esp32-elf-gcc/Makefile b/cross/xtensa-esp32-elf-gcc/Makefile
index dac25137bd2..2fbfc2cfcc9 100644
--- a/cross/xtensa-esp32-elf-gcc/Makefile
+++ b/cross/xtensa-esp32-elf-gcc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2022/06/28 11:31:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2022/07/22 02:01:54 tnn Exp $
 
+PKGREVISION=	2
 ESP32_TYPE=	esp32
 
-PKGREVISION= 1
 .include "${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/xtensa-esp32-elf-gcc/Makefile.common b/cross/xtensa-esp32-elf-gcc/Makefile.common
index cf42b7f02f4..d3179154ede 100644
--- a/cross/xtensa-esp32-elf-gcc/Makefile.common
+++ b/cross/xtensa-esp32-elf-gcc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2022/04/14 13:11:49 tnn Exp $
+# $NetBSD: Makefile.common,v 1.3 2022/07/22 02:01:54 tnn Exp $
 
 # used by cross/xtensa-esp32-elf-gcc/Makefile
 # used by cross/xtensa-esp32s2-elf-gcc/Makefile
@@ -24,9 +24,9 @@ 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
+NEWLIBVER=		esp32-2021r2-patch3_newlib-3_3_0-9e1cbb81
 SITES.newlib-${NEWLIBVER}.tar.gz= \
-	-https://github.com/espressif/newlib-esp32/archive/8a3197a2a9a42dd99605cf8cc1e0f2d3c976c58c.tar.gz
+	-https://github.com/espressif/newlib-esp32/archive/9e1cbb8144de573e8c2e8425b671a04d379bd166.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://github.com/espressif/gcc
@@ -60,6 +60,8 @@ MKPIE_SUPPORTED=	no
 # 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-local-prefix=${GNU_CONFIGURE_PREFIX}/xtensa-${ESP32_TYPE}-elf
+CONFIGURE_ARGS+=	--with-headers=${GNU_CONFIGURE_PREFIX}/xtensa-${ESP32_TYPE}-elf/include
 CONFIGURE_ARGS+=	--with-newlib
 CONFIGURE_ARGS+=	--enable-threads=no
 CONFIGURE_ARGS+=	--disable-shared
@@ -84,6 +86,32 @@ CONFIGURE_ARGS+=	--enable-libstdcxx-time=yes
 
 CONFIGURE_ARGS+=	--disable-bootstrap
 
+# configry for newlib
+CONFIGURE_ARGS+=	--enable-newlib-io-float
+CONFIGURE_ARGS+=	--disable-newlib-io-long-double
+CONFIGURE_ARGS+=	--disable-newlib-supplied-syscalls
+CONFIGURE_ARGS+=	--enable-newlib-io-pos-args
+CONFIGURE_ARGS+=	--enable-newlib-io-c99-formats
+CONFIGURE_ARGS+=	--enable-newlib-io-long-long
+CONFIGURE_ARGS+=	--disable-newlib-register-fini
+CONFIGURE_ARGS+=	--disable-newlib-nano-malloc
+CONFIGURE_ARGS+=	--disable-newlib-nano-formatted-io
+CONFIGURE_ARGS+=	--enable-newlib-atexit-dynamic-alloc
+CONFIGURE_ARGS+=	--disable-newlib-global-atexit
+CONFIGURE_ARGS+=	--disable-lite-exit
+CONFIGURE_ARGS+=	--enable-newlib-reent-small
+CONFIGURE_ARGS+=	--enable-newlib-multithread
+CONFIGURE_ARGS+=	--disable-newlib-retargetable-locking
+CONFIGURE_ARGS+=	--disable-newlib-wide-orient
+CONFIGURE_ARGS+=	--enable-newlib-fseek-optimization
+CONFIGURE_ARGS+=	--enable-newlib-fvwrite-in-streamio
+CONFIGURE_ARGS+=	--enable-newlib-unbuf-stream-opt
+CONFIGURE_ARGS+=	--enable-target-optspace
+CONFIGURE_ARGS+=	--enable-newlib-long-time_t
+CONFIGURE_ARGS+=	--enable-newlib-nano-malloc
+CONFIGURE_ARGS+=	--enable-newlib-retargetable-locking
+CONFIGURE_ARGS+=	--enable-newlib-iconv
+
 CHECK_PORTABILITY_SKIP+=	contrib/*
 
 post-extract:
diff --git a/cross/xtensa-esp32-elf-gcc/PLIST b/cross/xtensa-esp32-elf-gcc/PLIST
index f82534e38d3..b0ec7eaeef2 100644
--- a/cross/xtensa-esp32-elf-gcc/PLIST
+++ b/cross/xtensa-esp32-elf-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/04/14 00:50:00 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/07/22 02:01:54 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++
@@ -493,6 +493,48 @@ xtensa-esp32-elf/share/gcc-${PKGVERSION}/python/libstdcxx/__init__.py
 xtensa-esp32-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
 xtensa-esp32-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
 xtensa-esp32-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/xmethods.py
+xtensa-esp32-elf/share/iconv_data/big5.cct
+xtensa-esp32-elf/share/iconv_data/cns11643_plane1.cct
+xtensa-esp32-elf/share/iconv_data/cns11643_plane14.cct
+xtensa-esp32-elf/share/iconv_data/cns11643_plane2.cct
+xtensa-esp32-elf/share/iconv_data/cp775.cct
+xtensa-esp32-elf/share/iconv_data/cp850.cct
+xtensa-esp32-elf/share/iconv_data/cp852.cct
+xtensa-esp32-elf/share/iconv_data/cp855.cct
+xtensa-esp32-elf/share/iconv_data/cp866.cct
+xtensa-esp32-elf/share/iconv_data/encoding.aliases
+xtensa-esp32-elf/share/iconv_data/iso_8859_1.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_10.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_11.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_13.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_14.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_15.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_2.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_3.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_4.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_5.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_6.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_7.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_8.cct
+xtensa-esp32-elf/share/iconv_data/iso_8859_9.cct
+xtensa-esp32-elf/share/iconv_data/iso_ir_111.cct
+xtensa-esp32-elf/share/iconv_data/jis_x0201_1976.cct
+xtensa-esp32-elf/share/iconv_data/jis_x0208_1990.cct
+xtensa-esp32-elf/share/iconv_data/jis_x0212_1990.cct
+xtensa-esp32-elf/share/iconv_data/koi8_r.cct
+xtensa-esp32-elf/share/iconv_data/koi8_ru.cct
+xtensa-esp32-elf/share/iconv_data/koi8_u.cct
+xtensa-esp32-elf/share/iconv_data/koi8_uni.cct
+xtensa-esp32-elf/share/iconv_data/ksx1001.cct
+xtensa-esp32-elf/share/iconv_data/win_1250.cct
+xtensa-esp32-elf/share/iconv_data/win_1251.cct
+xtensa-esp32-elf/share/iconv_data/win_1252.cct
+xtensa-esp32-elf/share/iconv_data/win_1253.cct
+xtensa-esp32-elf/share/iconv_data/win_1254.cct
+xtensa-esp32-elf/share/iconv_data/win_1255.cct
+xtensa-esp32-elf/share/iconv_data/win_1256.cct
+xtensa-esp32-elf/share/iconv_data/win_1257.cct
+xtensa-esp32-elf/share/iconv_data/win_1258.cct
 xtensa-esp32-elf/xtensa-esp32-elf/include/_ansi.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/_newlib_version.h
 xtensa-esp32-elf/xtensa-esp32-elf/include/_syslist.h
@@ -1441,9 +1483,17 @@ 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/xtensa/config/core-isa.h
+xtensa-esp32-elf/xtensa-esp32-elf/lib/app.elf.ld
+xtensa-esp32-elf/xtensa-esp32-elf/lib/board.elf.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/crt1-boards.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/crt1-sim.o
 xtensa-esp32-elf/xtensa-esp32-elf/lib/default.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/app.elf.ld
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/board.elf.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/crt1-boards.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/crt1-sim.o
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/default.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libc.a
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libg.a
@@ -1453,8 +1503,15 @@ xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libnosys.a
 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/libsys_openocd.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/libsys_qemu.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/memory.elf.ld
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/app.elf.ld
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/board.elf.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/crt1-boards.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/crt1-sim.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
@@ -1464,9 +1521,18 @@ 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/libsys_openocd.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/libsys_qemu.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/memory.elf.ld
 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/no-rtti/sim.elf.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/sys.openocd.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/no-rtti/sys.qemu.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/nosys.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/sim.elf.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/sys.openocd.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/esp32-psram/sys.qemu.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libc.a
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libg.a
 xtensa-esp32-elf/xtensa-esp32-elf/lib/libgloss.a
@@ -1475,8 +1541,15 @@ xtensa-esp32-elf/xtensa-esp32-elf/lib/libnosys.a
 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/libsys_openocd.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/libsys_qemu.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/memory.elf.ld
 xtensa-esp32-elf/xtensa-esp32-elf/lib/nano.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/app.elf.ld
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/board.elf.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/crt0.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/crt1-boards.o
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/crt1-sim.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
@@ -1486,9 +1559,18 @@ 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/libsys_openocd.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/libsys_qemu.a
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/memory.elf.ld
 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/no-rtti/sim.elf.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/sys.openocd.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/no-rtti/sys.qemu.specs
 xtensa-esp32-elf/xtensa-esp32-elf/lib/nosys.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/sim.elf.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/sys.openocd.specs
+xtensa-esp32-elf/xtensa-esp32-elf/lib/sys.qemu.specs
 @pkgdir xtensa-esp32-elf/xtensa-esp32-elf/include/rpc
 @pkgdir xtensa-esp32-elf/xtensa-esp32-elf/include/bits
 @pkgdir xtensa-esp32-elf/include
diff --git a/cross/xtensa-esp32-elf-gcc/distinfo b/cross/xtensa-esp32-elf-gcc/distinfo
index 41c9c06cab4..59650923ee6 100644
--- a/cross/xtensa-esp32-elf-gcc/distinfo
+++ b/cross/xtensa-esp32-elf-gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2022/04/15 16:56:08 tnn Exp $
+$NetBSD: distinfo,v 1.8 2022/07/22 02:01:54 tnn Exp $
 
 BLAKE2s (crosstool-NG-esp-2021r2-patch3.tar.gz) = 2013c2818fd818473d5a6d923108f6c80bd6b62345a1e2a835bb4ba9a5f104b7
 SHA512 (crosstool-NG-esp-2021r2-patch3.tar.gz) = 65a4c60151fb13311c21092c9b575fa29cac1beb9642ed73940c2d5fb5b11b8129b73ccfab847a02fb99d0a6b596b98d7f54c40fdcf304a2b667ca78746ed2cb
@@ -6,9 +6,9 @@ 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
+BLAKE2s (newlib-esp32-2021r2-patch3_newlib-3_3_0-9e1cbb81.tar.gz) = acd19f2ce950b6522d68e969b0e72dad949fd5b5bb8e73460006f5f879466d53
+SHA512 (newlib-esp32-2021r2-patch3_newlib-3_3_0-9e1cbb81.tar.gz) = 9b93075b0cd3b22c839dfd55e576eaa2e41c5936754fb67a4cf0298cc291db0c6c22e780cd463ad331840ef5468f9df1f5ecaddbda573fb75ed9245d0aa34ebb
+Size (newlib-esp32-2021r2-patch3_newlib-3_3_0-9e1cbb81.tar.gz) = 21950118 bytes
 SHA1 (patch-gcc_config_host-darwin.c) = 497f2d417755071e78e69e9a3b75754b29055b20
 SHA1 (patch-gcc_system.h) = 72a75ff773b9b5f3d2f16f4ec7d29e032aba5f53
 SHA1 (patch-newlib_libc_posix_collate.c) = 2916597f1ca3b7beb2f67a457d8f448e1da8f896
diff --git a/cross/xtensa-esp32s2-elf-gcc/Makefile b/cross/xtensa-esp32s2-elf-gcc/Makefile
index 1fa4af33d54..85badf9536f 100644
--- a/cross/xtensa-esp32s2-elf-gcc/Makefile
+++ b/cross/xtensa-esp32s2-elf-gcc/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2022/04/14 00:50:59 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/22 02:01:54 tnn Exp $
 
+PKGREVISION=	2
 ESP32_TYPE=	esp32s2
 
 .include "${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/Makefile.common"
diff --git a/cross/xtensa-esp32s2-elf-gcc/PLIST b/cross/xtensa-esp32s2-elf-gcc/PLIST
index f80de450dfe..c0c2fd9abf0 100644
--- a/cross/xtensa-esp32s2-elf-gcc/PLIST
+++ b/cross/xtensa-esp32s2-elf-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/04/14 00:50:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/07/22 02:01:54 tnn Exp $
 xtensa-esp32s2-elf/bin/xtensa-esp32s2-elf-c++
 xtensa-esp32s2-elf/bin/xtensa-esp32s2-elf-cpp
 xtensa-esp32s2-elf/bin/xtensa-esp32s2-elf-g++
@@ -493,6 +493,48 @@ xtensa-esp32s2-elf/share/gcc-${PKGVERSION}/python/libstdcxx/__init__.py
 xtensa-esp32s2-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
 xtensa-esp32s2-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
 xtensa-esp32s2-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/xmethods.py
+xtensa-esp32s2-elf/share/iconv_data/big5.cct
+xtensa-esp32s2-elf/share/iconv_data/cns11643_plane1.cct
+xtensa-esp32s2-elf/share/iconv_data/cns11643_plane14.cct
+xtensa-esp32s2-elf/share/iconv_data/cns11643_plane2.cct
+xtensa-esp32s2-elf/share/iconv_data/cp775.cct
+xtensa-esp32s2-elf/share/iconv_data/cp850.cct
+xtensa-esp32s2-elf/share/iconv_data/cp852.cct
+xtensa-esp32s2-elf/share/iconv_data/cp855.cct
+xtensa-esp32s2-elf/share/iconv_data/cp866.cct
+xtensa-esp32s2-elf/share/iconv_data/encoding.aliases
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_1.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_10.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_11.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_13.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_14.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_15.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_2.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_3.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_4.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_5.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_6.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_7.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_8.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_8859_9.cct
+xtensa-esp32s2-elf/share/iconv_data/iso_ir_111.cct
+xtensa-esp32s2-elf/share/iconv_data/jis_x0201_1976.cct
+xtensa-esp32s2-elf/share/iconv_data/jis_x0208_1990.cct
+xtensa-esp32s2-elf/share/iconv_data/jis_x0212_1990.cct
+xtensa-esp32s2-elf/share/iconv_data/koi8_r.cct
+xtensa-esp32s2-elf/share/iconv_data/koi8_ru.cct
+xtensa-esp32s2-elf/share/iconv_data/koi8_u.cct
+xtensa-esp32s2-elf/share/iconv_data/koi8_uni.cct
+xtensa-esp32s2-elf/share/iconv_data/ksx1001.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1250.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1251.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1252.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1253.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1254.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1255.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1256.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1257.cct
+xtensa-esp32s2-elf/share/iconv_data/win_1258.cct
 xtensa-esp32s2-elf/xtensa-esp32s2-elf/include/_ansi.h
 xtensa-esp32s2-elf/xtensa-esp32s2-elf/include/_newlib_version.h
 xtensa-esp32s2-elf/xtensa-esp32s2-elf/include/_syslist.h
diff --git a/cross/xtensa-esp32s3-elf-gcc/Makefile b/cross/xtensa-esp32s3-elf-gcc/Makefile
index 9d64427109f..8cc5442ea3c 100644
--- a/cross/xtensa-esp32s3-elf-gcc/Makefile
+++ b/cross/xtensa-esp32s3-elf-gcc/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2022/04/14 00:51:49 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/22 02:01:55 tnn Exp $
 
+PKGREVISION=	2
 ESP32_TYPE=	esp32s3
 
 .include "${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/Makefile.common"
diff --git a/cross/xtensa-esp32s3-elf-gcc/PLIST b/cross/xtensa-esp32s3-elf-gcc/PLIST
index bf994e09e7f..fc6929567ac 100644
--- a/cross/xtensa-esp32s3-elf-gcc/PLIST
+++ b/cross/xtensa-esp32s3-elf-gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/04/14 00:51:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/07/22 02:01:55 tnn Exp $
 xtensa-esp32s3-elf/bin/xtensa-esp32s3-elf-c++
 xtensa-esp32s3-elf/bin/xtensa-esp32s3-elf-cpp
 xtensa-esp32s3-elf/bin/xtensa-esp32s3-elf-g++
@@ -493,6 +493,48 @@ xtensa-esp32s3-elf/share/gcc-${PKGVERSION}/python/libstdcxx/__init__.py
 xtensa-esp32s3-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
 xtensa-esp32s3-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
 xtensa-esp32s3-elf/share/gcc-${PKGVERSION}/python/libstdcxx/v6/xmethods.py
+xtensa-esp32s3-elf/share/iconv_data/big5.cct
+xtensa-esp32s3-elf/share/iconv_data/cns11643_plane1.cct
+xtensa-esp32s3-elf/share/iconv_data/cns11643_plane14.cct
+xtensa-esp32s3-elf/share/iconv_data/cns11643_plane2.cct
+xtensa-esp32s3-elf/share/iconv_data/cp775.cct
+xtensa-esp32s3-elf/share/iconv_data/cp850.cct
+xtensa-esp32s3-elf/share/iconv_data/cp852.cct
+xtensa-esp32s3-elf/share/iconv_data/cp855.cct
+xtensa-esp32s3-elf/share/iconv_data/cp866.cct
+xtensa-esp32s3-elf/share/iconv_data/encoding.aliases
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_1.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_10.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_11.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_13.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_14.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_15.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_2.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_3.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_4.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_5.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_6.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_7.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_8.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_8859_9.cct
+xtensa-esp32s3-elf/share/iconv_data/iso_ir_111.cct
+xtensa-esp32s3-elf/share/iconv_data/jis_x0201_1976.cct
+xtensa-esp32s3-elf/share/iconv_data/jis_x0208_1990.cct
+xtensa-esp32s3-elf/share/iconv_data/jis_x0212_1990.cct
+xtensa-esp32s3-elf/share/iconv_data/koi8_r.cct
+xtensa-esp32s3-elf/share/iconv_data/koi8_ru.cct
+xtensa-esp32s3-elf/share/iconv_data/koi8_u.cct
+xtensa-esp32s3-elf/share/iconv_data/koi8_uni.cct
+xtensa-esp32s3-elf/share/iconv_data/ksx1001.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1250.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1251.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1252.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1253.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1254.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1255.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1256.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1257.cct
+xtensa-esp32s3-elf/share/iconv_data/win_1258.cct
 xtensa-esp32s3-elf/xtensa-esp32s3-elf/include/_ansi.h
 xtensa-esp32s3-elf/xtensa-esp32s3-elf/include/_newlib_version.h
 xtensa-esp32s3-elf/xtensa-esp32s3-elf/include/_syslist.h