Thu Apr 14 13:11:49 2022 UTC ()
xtensa-esp32-elf-gcc: don't bother with full GCC bootstrap + disable MKPIE


(tnn)
diff -r1.1 -r1.2 pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common
cvs diff -r1.1 -r1.2 pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common (expand / switch to unified diff)

--- pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common 2022/04/14 00:50:00 1.1
+++ pkgsrc/cross/xtensa-esp32-elf-gcc/Makefile.common 2022/04/14 13:11:49 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.1 2022/04/14 00:50:00 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.2 2022/04/14 13:11:49 tnn Exp $
2 2
3# used by cross/xtensa-esp32-elf-gcc/Makefile 3# used by cross/xtensa-esp32-elf-gcc/Makefile
4# used by cross/xtensa-esp32s2-elf-gcc/Makefile 4# used by cross/xtensa-esp32s2-elf-gcc/Makefile
5# used by cross/xtensa-esp32s3-elf-gcc/Makefile 5# used by cross/xtensa-esp32s3-elf-gcc/Makefile
6 6
7# We could use the upstream GCC distfile, but Espressif has important vendor 7# We could use the upstream GCC distfile, but Espressif has important vendor
8# patches in their branch and it seems not worth the maintenance overhead to 8# patches in their branch and it seems not worth the maintenance overhead to
9# extract them and put them in pkgsrc. 9# extract them and put them in pkgsrc.
10#DISTNAME= gcc-8.3.0 10#DISTNAME= gcc-8.3.0
11#MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/} 11#MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/}
12#EXTRACT_SUFX= .tar.xz 12#EXTRACT_SUFX= .tar.xz
13 13
14DISTNAME= espressif-gcc-8.4.0 14DISTNAME= espressif-gcc-8.4.0
@@ -45,52 +45,55 @@ DISTINFO_FILE= ${.CURDIR}/../../cross/xt @@ -45,52 +45,55 @@ DISTINFO_FILE= ${.CURDIR}/../../cross/xt
45DESCR_SRC= ${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/DESCR 45DESCR_SRC= ${.CURDIR}/../../cross/xtensa-esp32-elf-gcc/DESCR
46 46
47# for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549 47# for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33549
48# use makeinfo from pkgsrc/devel/gtexinfo. 48# use makeinfo from pkgsrc/devel/gtexinfo.
49TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo 49TOOL_DEPENDS+= gtexinfo>=5.1:../../devel/gtexinfo
50_TOOLS_USE_PKGSRC.makeinfo= yes 50_TOOLS_USE_PKGSRC.makeinfo= yes
51 51
52OBJDIR= ../build 52OBJDIR= ../build
53CONFIGURE_DIRS= ${OBJDIR} 53CONFIGURE_DIRS= ${OBJDIR}
54CONFIGURE_SCRIPT= ${WRKSRC}/configure 54CONFIGURE_SCRIPT= ${WRKSRC}/configure
55CONFIG_SHELL= ${TOOLS_PATH.bash} 55CONFIG_SHELL= ${TOOLS_PATH.bash}
56WRAPPER_SHELL= ${TOOLS_PATH.bash} 56WRAPPER_SHELL= ${TOOLS_PATH.bash}
57GNU_CONFIGURE_PREFIX= ${PREFIX}/xtensa-${ESP32_TYPE}-elf 57GNU_CONFIGURE_PREFIX= ${PREFIX}/xtensa-${ESP32_TYPE}-elf
 58MKPIE_SUPPORTED= no
58 59
59# This is based on "gcc -v" output from the binary release 60# This is based on "gcc -v" output from the binary release
60# xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz 61# xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-linux-amd64.tar.gz
61CONFIGURE_ARGS+= --target=xtensa-${ESP32_TYPE}-elf 62CONFIGURE_ARGS+= --target=xtensa-${ESP32_TYPE}-elf
62CONFIGURE_ARGS+= --with-newlib 63CONFIGURE_ARGS+= --with-newlib
63CONFIGURE_ARGS+= --enable-threads=no 64CONFIGURE_ARGS+= --enable-threads=no
64CONFIGURE_ARGS+= --disable-shared 65CONFIGURE_ARGS+= --disable-shared
65CONFIGURE_ARGS+= --disable-__cxa_atexit 66CONFIGURE_ARGS+= --disable-__cxa_atexit
66CONFIGURE_ARGS+= --enable-cxx-flags="-ffunction-sections" 67CONFIGURE_ARGS+= --enable-cxx-flags="-ffunction-sections"
67CONFIGURE_ARGS+= --disable-libgomp 68CONFIGURE_ARGS+= --disable-libgomp
68CONFIGURE_ARGS+= --disable-libmudflap 69CONFIGURE_ARGS+= --disable-libmudflap
69CONFIGURE_ARGS+= --disable-libmpx 70CONFIGURE_ARGS+= --disable-libmpx
70CONFIGURE_ARGS+= --disable-libssp 71CONFIGURE_ARGS+= --disable-libssp
71CONFIGURE_ARGS+= --disable-libquadmath 72CONFIGURE_ARGS+= --disable-libquadmath
72CONFIGURE_ARGS+= --disable-libquadmath-support 73CONFIGURE_ARGS+= --disable-libquadmath-support
73CONFIGURE_ARGS+= --enable-lto 74CONFIGURE_ARGS+= --enable-lto
74CONFIGURE_ARGS+= --enable-target-optspace 75CONFIGURE_ARGS+= --enable-target-optspace
75CONFIGURE_ARGS+= --without-long-double-128 76CONFIGURE_ARGS+= --without-long-double-128
76CONFIGURE_ARGS+= --disable-nls 77CONFIGURE_ARGS+= --disable-nls
77CONFIGURE_ARGS+= --enable-multiarch 78CONFIGURE_ARGS+= --enable-multiarch
78CONFIGURE_ARGS+= --enable-languages=c,c++ 79CONFIGURE_ARGS+= --enable-languages=c,c++
79CONFIGURE_ARGS+= --disable-libstdcxx-verbose 80CONFIGURE_ARGS+= --disable-libstdcxx-verbose
80CONFIGURE_ARGS+= --enable-threads=posix 81CONFIGURE_ARGS+= --enable-threads=posix
81CONFIGURE_ARGS+= --enable-gcov-custom-rtio 82CONFIGURE_ARGS+= --enable-gcov-custom-rtio
82CONFIGURE_ARGS+= --enable-libstdcxx-time=yes 83CONFIGURE_ARGS+= --enable-libstdcxx-time=yes
83 84
 85CONFIGURE_ARGS+= --disable-bootstrap
 86
84CHECK_PORTABILITY_SKIP+= contrib/* 87CHECK_PORTABILITY_SKIP+= contrib/*
85 88
86post-extract: 89post-extract:
87 mv ${WRKDIR}/newlib-*/newlib ${WRKSRC}/newlib 90 mv ${WRKDIR}/newlib-*/newlib ${WRKSRC}/newlib
88 mv ${WRKDIR}/newlib-*/libgloss ${WRKSRC}/libgloss 91 mv ${WRKDIR}/newlib-*/libgloss ${WRKSRC}/libgloss
89 ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/gcc/. ${WRKSRC}/. 92 ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/gcc/. ${WRKSRC}/.
90 ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/newlib/. ${WRKSRC}/. 93 ${CP} -r ${WRKDIR}/overlays/xtensa_${ESP32_TYPE}/newlib/. ${WRKSRC}/.
91 94
92pre-configure: 95pre-configure:
93 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 96 ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
94 97
95.include "../../devel/gmp/buildlink3.mk" 98.include "../../devel/gmp/buildlink3.mk"
96.include "../../math/mpfr/buildlink3.mk" 99.include "../../math/mpfr/buildlink3.mk"