Skip to content

Commit afc7634

Browse files
authored
Merge pull request #38 from smartobjectoriented/37-rootfs-update-toolchain-for-cm4_64-defconfig
Updated toolchain version to 11.X
2 parents 92702ba + a918b75 commit afc7634

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

linux/rootfs/configs/cm4_64_defconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL="toolchain-external-custom"
217217
BR2_TOOLCHAIN_EXTERNAL_PREFIX="aarch64-none-linux-gnu"
218218
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS=y
219219
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="aarch64-none-linux-gnu"
220-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
220+
BR2_TOOLCHAIN_EXTERNAL_GCC_11=y
221+
# BR2_TOOLCHAIN_EXTERNAL_GCC_10 is not set
221222
# BR2_TOOLCHAIN_EXTERNAL_GCC_9 is not set
222223
# BR2_TOOLCHAIN_EXTERNAL_GCC_8 is not set
223224
# BR2_TOOLCHAIN_EXTERNAL_GCC_7 is not set
@@ -289,7 +290,7 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
289290
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL is not set
290291
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
291292
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG=y
292-
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
293+
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
293294
BR2_TOOLCHAIN_EXTERNAL_CXX=y
294295
# BR2_TOOLCHAIN_EXTERNAL_DLANG is not set
295296
# BR2_TOOLCHAIN_EXTERNAL_FORTRAN is not set
@@ -380,7 +381,8 @@ BR2_TOOLCHAIN_GCC_AT_LEAST_7=y
380381
BR2_TOOLCHAIN_GCC_AT_LEAST_8=y
381382
BR2_TOOLCHAIN_GCC_AT_LEAST_9=y
382383
BR2_TOOLCHAIN_GCC_AT_LEAST_10=y
383-
BR2_TOOLCHAIN_GCC_AT_LEAST="10"
384+
BR2_TOOLCHAIN_GCC_AT_LEAST_11=y
385+
BR2_TOOLCHAIN_GCC_AT_LEAST="11"
384386
BR2_TOOLCHAIN_HAS_MNAN_OPTION=y
385387
BR2_TOOLCHAIN_HAS_SYNC_1=y
386388
BR2_TOOLCHAIN_HAS_SYNC_2=y

linux/rootfs/configs/virt64_defconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL="toolchain-external-custom"
223223
BR2_TOOLCHAIN_EXTERNAL_PREFIX="aarch64-none-linux-gnu"
224224
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS=y
225225
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="aarch64-none-linux-gnu"
226-
# BR2_TOOLCHAIN_EXTERNAL_GCC_11 is not set
227-
BR2_TOOLCHAIN_EXTERNAL_GCC_10=y
226+
BR2_TOOLCHAIN_EXTERNAL_GCC_11=y
227+
# BR2_TOOLCHAIN_EXTERNAL_GCC_10 is not set
228228
# BR2_TOOLCHAIN_EXTERNAL_GCC_9 is not set
229229
# BR2_TOOLCHAIN_EXTERNAL_GCC_8 is not set
230230
# BR2_TOOLCHAIN_EXTERNAL_GCC_7 is not set
@@ -302,7 +302,7 @@ BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
302302
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL is not set
303303
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
304304
BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG=y
305-
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
305+
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
306306
BR2_TOOLCHAIN_EXTERNAL_CXX=y
307307
# BR2_TOOLCHAIN_EXTERNAL_DLANG is not set
308308
# BR2_TOOLCHAIN_EXTERNAL_FORTRAN is not set
@@ -320,7 +320,6 @@ BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS=y
320320
#
321321
BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS=y
322322
BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK=y
323-
BR2_TOOLCHAIN_HAS_NATIVE_RPC=y
324323
BR2_USE_WCHAR=y
325324
BR2_ENABLE_LOCALE=y
326325
BR2_INSTALL_LIBSTDCPP=y
@@ -393,7 +392,8 @@ BR2_TOOLCHAIN_GCC_AT_LEAST_7=y
393392
BR2_TOOLCHAIN_GCC_AT_LEAST_8=y
394393
BR2_TOOLCHAIN_GCC_AT_LEAST_9=y
395394
BR2_TOOLCHAIN_GCC_AT_LEAST_10=y
396-
BR2_TOOLCHAIN_GCC_AT_LEAST="10"
395+
BR2_TOOLCHAIN_GCC_AT_LEAST_11=y
396+
BR2_TOOLCHAIN_GCC_AT_LEAST="11"
397397
BR2_TOOLCHAIN_HAS_MNAN_OPTION=y
398398
BR2_TOOLCHAIN_HAS_SYNC_1=y
399399
BR2_TOOLCHAIN_HAS_SYNC_2=y

0 commit comments

Comments
 (0)