diff --git a/cross/gcc4-aarch64/APKBUILD b/cross/gcc4-aarch64/APKBUILD index 580fe4035..20fd950cb 100644 --- a/cross/gcc4-aarch64/APKBUILD +++ b/cross/gcc4-aarch64/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-aarch64 pkgver=9999 _pkgver=4.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" diff --git a/cross/gcc4-armhf/1001-fix-reload1-compile-error.patch b/cross/gcc4-armhf/1001-fix-reload1-compile-error.patch new file mode 100644 index 000000000..2f4699d7b --- /dev/null +++ b/cross/gcc4-armhf/1001-fix-reload1-compile-error.patch @@ -0,0 +1,17 @@ +Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10). + +The error was: + +.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 + +--- gcc-4.8.5/gcc/reload1.c~ 2013-01-21 06:55:05.000000000 -0800 ++++ gcc-4.8.5/gcc/reload1.c 2022-01-05 17:18:10.148547719 -0800 +@@ -440,7 +440,7 @@ + + while (memory_address_p (QImode, tem)) + { +- spill_indirect_levels++; ++ spill_indirect_levels = 1; + tem = gen_rtx_MEM (Pmode, tem); + } + diff --git a/cross/gcc4-armhf/APKBUILD b/cross/gcc4-armhf/APKBUILD index bdd3f788a..6912c463b 100644 --- a/cross/gcc4-armhf/APKBUILD +++ b/cross/gcc4-armhf/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-armhf pkgver=9999 _pkgver=4.9.2 -pkgrel=2 +pkgrel=5 pkgdesc="Stage2 cross-compiler for armhf" url="http://gcc.gnu.org" arch="x86_64" @@ -215,6 +215,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg hardenednossp.specs hardenednopie.specs hardenednopiessp.specs + + 1001-fix-reload1-compile-error.patch " # we build out-of-tree @@ -432,7 +434,8 @@ package() { done } -sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936 gcc-4.9.2.tar.gz +sha512sums=" +35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936 gcc-4.9.2.tar.gz 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 ecj-4.9.jar 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4 01_all_gcc49_configure.patch 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6 02_all_gcc48_config.in.patch @@ -480,4 +483,6 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb vanilla.specs e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12 hardenednossp.specs b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168 hardenednopie.specs -f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a hardenednopiessp.specs" +f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a hardenednopiessp.specs +6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00 1001-fix-reload1-compile-error.patch +" diff --git a/cross/gcc4-armv7/APKBUILD b/cross/gcc4-armv7/APKBUILD index 4713568df..593ecdea8 100644 --- a/cross/gcc4-armv7/APKBUILD +++ b/cross/gcc4-armv7/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-armv7 pkgver=9999 _pkgver=4.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" diff --git a/cross/gcc6-aarch64/0015-fix-error_p-null-error.patch b/cross/gcc6-aarch64/0015-fix-error_p-null-error.patch new file mode 100644 index 000000000..ac609b9e2 --- /dev/null +++ b/cross/gcc6-aarch64/0015-fix-error_p-null-error.patch @@ -0,0 +1,30 @@ +This fixes + +/wrkdirs/usr/ports/lang/gcc7/work/gcc-7.5.0/gcc/config/i386/i386.c:9631:8: error: cannot initialize a variable of type 'bool' with an rvalue of type 'nullptr_t' + bool error_p = NULL; + ^ ~~~~ + +and comes from upstream as part of + + commit 9f36390d429502f0a0dee20bda5b4870da948f6a + Author: Uros Bizjak + Date: Sat May 6 09:01:51 2017 +0200 + + i386.c (ext_80387_constant_init): Do not explicitly initialize to zero. + + * config/i386/i386.c (ext_80387_constant_init): Do not explicitly + initialize to zero. + (init_regs): Remove declaration. + (function_arg_advance_32): Initialize error_p as boolean variable. + +--- a/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC ++++ b/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC +@@ -9628,7 +9628,7 @@ function_arg_advance_32 (CUMULATIVE_ARGS *cum, machine + HOST_WIDE_INT words) + { + int res = 0; +- bool error_p = NULL; ++ bool error_p = false; + + if (TARGET_IAMCU) + { diff --git a/cross/gcc6-aarch64/APKBUILD b/cross/gcc6-aarch64/APKBUILD index 6a39035ca..1a1e4586b 100644 --- a/cross/gcc6-aarch64/APKBUILD +++ b/cross/gcc6-aarch64/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-aarch64 pkgver=9999 _pkgver=6.4.0 -pkgrel=8 +pkgrel=10 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" @@ -223,6 +223,7 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0014-fix-missing-includes-isl-0.20.patch + 0015-fix-error_p-null-error.patch " # we build out-of-tree @@ -440,7 +441,8 @@ package() { done } -sha512sums="02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz +sha512sums=" +02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 ecj-4.9.jar a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d 001_all_default-ssp-strong.patch e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513 002_all_default-relro.patch @@ -493,4 +495,6 @@ b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1 c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch -e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch +a3ab3b63583587cf9e3e9c3f30089c440bc58c3d87199d50e7c3dda2bf308685eae162ed122d481e472814498008e41c192581ca393629adf4487ea0e3f91254 0015-fix-error_p-null-error.patch +" diff --git a/cross/gcc6-armhf/0015-fix-error_p-null-error.patch b/cross/gcc6-armhf/0015-fix-error_p-null-error.patch new file mode 100644 index 000000000..ac609b9e2 --- /dev/null +++ b/cross/gcc6-armhf/0015-fix-error_p-null-error.patch @@ -0,0 +1,30 @@ +This fixes + +/wrkdirs/usr/ports/lang/gcc7/work/gcc-7.5.0/gcc/config/i386/i386.c:9631:8: error: cannot initialize a variable of type 'bool' with an rvalue of type 'nullptr_t' + bool error_p = NULL; + ^ ~~~~ + +and comes from upstream as part of + + commit 9f36390d429502f0a0dee20bda5b4870da948f6a + Author: Uros Bizjak + Date: Sat May 6 09:01:51 2017 +0200 + + i386.c (ext_80387_constant_init): Do not explicitly initialize to zero. + + * config/i386/i386.c (ext_80387_constant_init): Do not explicitly + initialize to zero. + (init_regs): Remove declaration. + (function_arg_advance_32): Initialize error_p as boolean variable. + +--- a/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC ++++ b/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC +@@ -9628,7 +9628,7 @@ function_arg_advance_32 (CUMULATIVE_ARGS *cum, machine + HOST_WIDE_INT words) + { + int res = 0; +- bool error_p = NULL; ++ bool error_p = false; + + if (TARGET_IAMCU) + { diff --git a/cross/gcc6-armhf/APKBUILD b/cross/gcc6-armhf/APKBUILD index 913f66a98..5b2966432 100644 --- a/cross/gcc6-armhf/APKBUILD +++ b/cross/gcc6-armhf/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-armhf pkgver=9999 _pkgver=6.4.0 -pkgrel=8 +pkgrel=10 pkgdesc="Stage2 cross-compiler for armhf" url="http://gcc.gnu.org" arch="x86_64" @@ -223,6 +223,7 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0014-fix-missing-includes-isl-0.20.patch + 0015-fix-error_p-null-error.patch " # we build out-of-tree @@ -440,7 +441,8 @@ package() { done } -sha512sums="02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz +sha512sums=" +02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 ecj-4.9.jar a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d 001_all_default-ssp-strong.patch e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513 002_all_default-relro.patch @@ -493,4 +495,6 @@ b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1 c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch -e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch +a3ab3b63583587cf9e3e9c3f30089c440bc58c3d87199d50e7c3dda2bf308685eae162ed122d481e472814498008e41c192581ca393629adf4487ea0e3f91254 0015-fix-error_p-null-error.patch +" diff --git a/cross/gcc6-armv7/0015-fix-error_p-null-error.patch b/cross/gcc6-armv7/0015-fix-error_p-null-error.patch new file mode 100644 index 000000000..ac609b9e2 --- /dev/null +++ b/cross/gcc6-armv7/0015-fix-error_p-null-error.patch @@ -0,0 +1,30 @@ +This fixes + +/wrkdirs/usr/ports/lang/gcc7/work/gcc-7.5.0/gcc/config/i386/i386.c:9631:8: error: cannot initialize a variable of type 'bool' with an rvalue of type 'nullptr_t' + bool error_p = NULL; + ^ ~~~~ + +and comes from upstream as part of + + commit 9f36390d429502f0a0dee20bda5b4870da948f6a + Author: Uros Bizjak + Date: Sat May 6 09:01:51 2017 +0200 + + i386.c (ext_80387_constant_init): Do not explicitly initialize to zero. + + * config/i386/i386.c (ext_80387_constant_init): Do not explicitly + initialize to zero. + (init_regs): Remove declaration. + (function_arg_advance_32): Initialize error_p as boolean variable. + +--- a/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC ++++ b/gcc/config/i386/i386.c 2019-11-01 20:30:26 UTC +@@ -9628,7 +9628,7 @@ function_arg_advance_32 (CUMULATIVE_ARGS *cum, machine + HOST_WIDE_INT words) + { + int res = 0; +- bool error_p = NULL; ++ bool error_p = false; + + if (TARGET_IAMCU) + { diff --git a/cross/gcc6-armv7/APKBUILD b/cross/gcc6-armv7/APKBUILD index dddfa9fc1..11fa14fa9 100644 --- a/cross/gcc6-armv7/APKBUILD +++ b/cross/gcc6-armv7/APKBUILD @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-armv7 pkgver=9999 _pkgver=6.4.0 -pkgrel=8 +pkgrel=10 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" @@ -223,6 +223,7 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch 0014-fix-missing-includes-isl-0.20.patch + 0015-fix-error_p-null-error.patch " # we build out-of-tree @@ -440,7 +441,8 @@ package() { done } -sha512sums="02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz +sha512sums=" +02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 gcc-6.4.0.tar.xz 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 ecj-4.9.jar a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d 001_all_default-ssp-strong.patch e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513 002_all_default-relro.patch @@ -493,4 +495,6 @@ b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1 c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch -e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch +a3ab3b63583587cf9e3e9c3f30089c440bc58c3d87199d50e7c3dda2bf308685eae162ed122d481e472814498008e41c192581ca393629adf4487ea0e3f91254 0015-fix-error_p-null-error.patch +" diff --git a/main/gcc4/APKBUILD b/main/gcc4/APKBUILD index 9e045ca32..40a39a29d 100644 --- a/main/gcc4/APKBUILD +++ b/main/gcc4/APKBUILD @@ -1,7 +1,7 @@ pkgname=gcc4 pkgver=9999 _pkgver=4.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD index c0b4f3e56..05b1b1a4c 100644 --- a/main/gcc6/APKBUILD +++ b/main/gcc6/APKBUILD @@ -1,7 +1,7 @@ pkgname=gcc6 pkgver=9999 _pkgver=6.4.0 -pkgrel=9 +pkgrel=10 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all"