--- devel/xtensa-esp32-elf/Makefile
+++ devel/xtensa-esp32-elf/Makefile
@@ -73,8 +73,11 @@ post-extract:
 .for F in $(DISTFILES:N$(EXTRACT_ONLY))
        ${LN} -s ${DISTDIR}/${F:C/:source[0-9]+$//} ${TARBALLS}
 .endfor
-       ${MKDIR} ${WRKSRC}/local-patches/gdb/7.10
+       ${MKDIR} ${WRKSRC}/local-patches/gdb/7.10 \
+           ${WRKSRC}/local-patches/gmp/6.0.0a
        ${CP} ${FILESDIR}/0001-gdb-7.12.1.patch ${WRKSRC}/local-patches/gdb/7.10
+       ${CP} ${FILESDIR}/0001-gmp-6.0.0a.patch \
+           ${WRKSRC}/local-patches/gmp/6.0.0a
        echo CT_LOG_PROGRESS_BAR=n >> \
            ${BUILD_WRKSRC}/samples/${PORTNAME}/crosstool.config