* [Buildroot] [PATCH 2/5] arch/Config.in: disable internal toolchain backend for csky
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
@ 2021-10-03 12:40 ` Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 3/5] package/glibc: remove glibc csky fork Romain Naour
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2021-10-03 12:40 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni, Guo Ren
We are going to remove the gcc fork for csky, first disable
the internal toolchain backend.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
arch/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/Config.in b/arch/Config.in
index 1853e26bb4..ab40294ddc 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -77,6 +77,7 @@ config BR2_aarch64_be
config BR2_csky
bool "csky"
+ select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_ARCH_HAS_MMU_MANDATORY
# Most variants are supported by gcc-9+, except one that is
# handled as a special exception in package/gcc/Config.in.host
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 3/5] package/glibc: remove glibc csky fork
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 2/5] arch/Config.in: disable internal toolchain backend for csky Romain Naour
@ 2021-10-03 12:40 ` Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 4/5] package/gcc: remove csky version Romain Naour
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2021-10-03 12:40 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni, Guo Ren
Before removing csky gcc fork, remove the glibc fork.
csky support has been merged in glibc 2.29 [1].
[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=5f72b00591ce4d1b4c0418294ffe1623983d5679
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
.../7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash | 2 --
package/glibc/glibc.mk | 5 -----
2 files changed, 7 deletions(-)
delete mode 100644 package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
diff --git a/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash b/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
deleted file mode 100644
index a61bd65f80..0000000000
--- a/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated (fetched from https://github.com/c-sky/glibc)
-sha512 9deb2deceefe347d72de13510a5baa3de00f94c684f3b25e136ca3660f61e65a69f2115abb488c2ab0fa93cda8535853ce1e13e186efcc8434ecc4049efd82b5 glibc-7630ed2fa60caea98f500e4a7a51b88f9bf1e176.tar.gz
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index c911c29554..3862e0624b 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -4,10 +4,6 @@
#
################################################################################
-ifeq ($(BR2_csky),y)
-GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
-GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
-else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
# When updating the version, please also update localedef
@@ -19,7 +15,6 @@ GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
# *NEVER* decide on a version string by looking at the mirror.
# Then check that the mirror has been synced already (happens once a day.)
GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION))
-endif
GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)
GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/5] package/gcc: remove csky version
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 2/5] arch/Config.in: disable internal toolchain backend for csky Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 3/5] package/glibc: remove glibc csky fork Romain Naour
@ 2021-10-03 12:40 ` Romain Naour
2021-10-03 12:40 ` [Buildroot] [PATCH 5/5] package/binutils: " Romain Naour
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2021-10-03 12:40 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni, Guo Ren
Remove gcc csky fork since it doesn't build with the latest compilers
(gcc 8, 10, 11 tested) [1].
Removing the csky gcc fork has become unavoidable since the
Buildroot Docker image used by the gitlab CI will switch soon to
Debian bullseye soon [2].
The csky support for csky807 and csky810 has been upstreamed in
gcc 10 [3] and csky860 will be supported by gcc 12 [4]. There is
no info about the csky610. Although the csky architecture is
supported since gcc 10, the support was not enabled in Buildroot.
[1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html
[2] 71b83227128be62c169313e85bb8f339f977ad67
[3] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=cc7232b999b8336cf4e261407ed9289c77bed1f0
[4] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=db92bd223e3957ee58b5a0c0fffd8b7766f1def3
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 6 +
arch/Config.in | 2 -
...er-Remove-cyclades-from-libsanitizer.patch | 121 ------------------
package/gcc/Config.in.host | 12 --
package/gcc/gcc.hash | 2 -
package/gcc/gcc.mk | 3 -
6 files changed, 6 insertions(+), 140 deletions(-)
delete mode 100644 package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch
diff --git a/Config.in.legacy b/Config.in.legacy
index 9f1f7687fb..2ce455c633 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2021.11"
+config BR2_GCC_VERSION_CSKY
+ bool "gcc csky version removed"
+ select BR2_LEGACY
+ help
+ Support for gcc csky version has been removed.
+
config BR2_PACKAGE_STRONGSWAN_EAP
bool "strongswan EAP plugins now individually selectable"
select BR2_LEGACY
diff --git a/arch/Config.in b/arch/Config.in
index ab40294ddc..d50718e2d4 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -79,8 +79,6 @@ config BR2_csky
bool "csky"
select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_ARCH_HAS_MMU_MANDATORY
- # Most variants are supported by gcc-9+, except one that is
- # handled as a special exception in package/gcc/Config.in.host
select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
help
csky is processor IP from china.
diff --git a/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch b/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch
deleted file mode 100644
index 9e6c4cfd03..0000000000
--- a/package/gcc/48152afb96c59733d5bc79e3399bb7b3d4b44266/0001-libsanitizer-Remove-cyclades-from-libsanitizer.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 0d2ee4f3a8cd3516f2c5c2f06373f8a32fd77b9d Mon Sep 17 00:00:00 2001
-From: Tamar Christina <tamar.christina@arm.com>
-Date: Fri, 21 May 2021 12:16:56 +0100
-Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer
-
-The Linux kernel has removed the interface to cyclades from
-the latest kernel headers[1] due to them being orphaned for the
-past 13 years.
-
-libsanitizer uses this header when compiling against glibc, but
-glibcs itself doesn't seem to have any references to cyclades.
-
-Further more it seems that the driver is broken in the kernel and
-the firmware doesn't seem to be available anymore.
-
-As such since this is breaking the build of libsanitizer (and so the
-GCC bootstrap[2]) I propose to remove this.
-
-[1] https://lkml.org/lkml/2021/3/2/153
-[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379
-
-libsanitizer/ChangeLog:
-
- PR sanitizer/100379
- * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick
- llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135.
- * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
- * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise.
----
- .../sanitizer_common_interceptors_ioctl.inc | 9 ---------
- .../sanitizer_platform_limits_posix.cc | 11 -----------
- .../sanitizer_platform_limits_posix.h | 10 ----------
- 3 files changed, 30 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 6c5fda09fbf..8f9314142b6 100755
---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -358,15 +358,6 @@ static void ioctl_table_fill() {
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
-- _(CYGETDEFTHRESH, WRITE, sizeof(int));
-- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
-- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
-- _(CYGETTHRESH, WRITE, sizeof(int));
-- _(CYGETTIMEOUT, WRITE, sizeof(int));
-- _(CYSETDEFTHRESH, NONE, 0);
-- _(CYSETDEFTIMEOUT, NONE, 0);
-- _(CYSETTHRESH, NONE, 0);
-- _(CYSETTIMEOUT, NONE, 0);
- _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
- _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
- _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 9866cc9e17a..5277407aec7 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -156,7 +156,6 @@ typedef struct user_fpregs elf_fpregset_t;
- #endif
- #include <sys/user.h>
- #include <sys/ustat.h>
--#include <linux/cyclades.h>
- #include <linux/if_eql.h>
- #include <linux/if_plip.h>
- #include <linux/lp.h>
-@@ -439,7 +438,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
-- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
- unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
- #else
-@@ -806,15 +804,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
-- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
-- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
-- unsigned IOCTL_CYGETMON = CYGETMON;
-- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
-- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
-- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
-- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
-- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
-- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
- unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
- unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
- unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-index b6f90eb3a74..ae3a938344d 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -949,7 +949,6 @@ struct __sanitizer_cookie_io_functions_t {
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- extern unsigned struct_ax25_parms_struct_sz;
-- extern unsigned struct_cyclades_monitor_sz;
- extern unsigned struct_input_keymap_entry_sz;
- extern unsigned struct_ipx_config_data_sz;
- extern unsigned struct_kbdiacrs_sz;
-@@ -1294,15 +1293,6 @@ struct __sanitizer_cookie_io_functions_t {
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
-- extern unsigned IOCTL_CYGETDEFTHRESH;
-- extern unsigned IOCTL_CYGETDEFTIMEOUT;
-- extern unsigned IOCTL_CYGETMON;
-- extern unsigned IOCTL_CYGETTHRESH;
-- extern unsigned IOCTL_CYGETTIMEOUT;
-- extern unsigned IOCTL_CYSETDEFTHRESH;
-- extern unsigned IOCTL_CYSETDEFTIMEOUT;
-- extern unsigned IOCTL_CYSETTHRESH;
-- extern unsigned IOCTL_CYSETTIMEOUT;
- extern unsigned IOCTL_EQL_EMANCIPATE;
- extern unsigned IOCTL_EQL_ENSLAVE;
- extern unsigned IOCTL_EQL_GETMASTRCFG;
---
-2.31.1
-
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 2b7f88154e..aa2665cbee 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -3,7 +3,6 @@ comment "GCC Options"
choice
prompt "GCC compiler Version"
default BR2_GCC_VERSION_ARC if BR2_arc
- default BR2_GCC_VERSION_CSKY if BR2_csky
default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE
default BR2_GCC_VERSION_10_X
help
@@ -15,12 +14,6 @@ config BR2_GCC_VERSION_ARC
depends on BR2_arc
select BR2_TOOLCHAIN_GCC_AT_LEAST_9
-config BR2_GCC_VERSION_CSKY
- bool "gcc csky"
- # Only supported architecture
- depends on BR2_csky
- select BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
config BR2_GCC_VERSION_POWERPC_SPE
bool "gcc powerpc spe"
# powerpc spe support has been deprecated since gcc 8.x.
@@ -57,10 +50,6 @@ config BR2_GCC_VERSION_11_X
# powerpc spe support has been deprecated since gcc 8.x.
# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
depends on !BR2_powerpc_SPE
- # C-SKY sk610 needs abiv1, which is not supported in
- # upstream gcc. C-SKY gcc upstream support not tested
- # with upstream binutils and glibc.
- depends on !BR2_csky
# uClibc-ng broken on sparc due to recent gcc changes
# that need to be reverted since gcc 8.4, 9.3 and 10.1.
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784
@@ -94,7 +83,6 @@ config BR2_GCC_VERSION
default "10.3.0" if BR2_GCC_VERSION_10_X
default "11.2.0" if BR2_GCC_VERSION_11_X
default "arc-2020.09-release" if BR2_GCC_VERSION_ARC
- default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY
config BR2_EXTRA_GCC_CONFIG_OPTIONS
string "Additional gcc options"
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index b37307ebe3..5655c7a9d7 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -11,5 +11,3 @@ sha512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a614
sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz
# Locally calculated (fetched from Github)
sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz
-# Locally calculated (fetched from https://github.com/c-sky/gcc)
-sha512 1c3564fd6573dce13451a73015e7d88fecbb214dc1df96607976255b1d8b9e60318405333f4f218eea8d07e3675a802b66eff6df3921d505c4036481512792c2 gcc-48152afb96c59733d5bc79e3399bb7b3d4b44266.tar.gz
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index ed9b93e50f..fcc352aa25 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -13,9 +13,6 @@ GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION))
ifeq ($(BR2_GCC_VERSION_ARC),y)
GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
-else ifeq ($(BR2_GCC_VERSION_CSKY),y)
-GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION))
-GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
else
GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 5/5] package/binutils: remove csky version
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
` (2 preceding siblings ...)
2021-10-03 12:40 ` [Buildroot] [PATCH 4/5] package/gcc: remove csky version Romain Naour
@ 2021-10-03 12:40 ` Romain Naour
2021-10-03 14:22 ` [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Thomas Petazzoni
2021-10-17 17:02 ` Yann E. MORIN
5 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2021-10-03 12:40 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni, Guo Ren
Binutils is the last part of the csky toolchain fork.
The csky support has been merged in binutils 2.32 [1].
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=9d24df82ece4e87a0328173d6bd31cb9ff558bb4
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Guo Ren <ren_guo@c-sky.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Config.in.legacy | 6 ++++++
package/binutils/Config.in.host | 7 -------
package/binutils/binutils.hash | 3 ---
package/binutils/binutils.mk | 6 ------
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 2ce455c633..e49583bc7a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2021.11"
+config BR2_BINUTILS_VERSION_CSKY
+ bool "binutils csky version removed"
+ select BR2_LEGACY
+ help
+ Support for binutils csky version has been removed.
+
config BR2_GCC_VERSION_CSKY
bool "gcc csky version removed"
select BR2_LEGACY
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index b4c86dd473..ea1f020989 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -9,7 +9,6 @@ choice
prompt "Binutils Version"
default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky
default BR2_BINUTILS_VERSION_ARC if BR2_arc
- default BR2_BINUTILS_VERSION_CSKY if BR2_csky
help
Select the version of binutils you wish to use.
@@ -33,7 +32,6 @@ config BR2_BINUTILS_VERSION_2_36_X
config BR2_BINUTILS_VERSION_2_37_X
bool "binutils 2.37"
- depends on !BR2_csky
# https://github.com/uclinux-dev/elf2flt/pull/16
# https://github.com/uclinux-dev/elf2flt/issues/12
depends on !BR2_BINFMT_FLAT
@@ -42,16 +40,11 @@ config BR2_BINUTILS_VERSION_ARC
bool "binutils arc (2.34.50)"
depends on BR2_arc
-config BR2_BINUTILS_VERSION_CSKY
- bool "binutils csky"
- depends on BR2_csky
-
endchoice
config BR2_BINUTILS_VERSION
string
default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC
- default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY
default "2.32" if BR2_BINUTILS_VERSION_2_32_X
default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X
default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X
diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash
index f543b49940..d1be6cbce8 100644
--- a/package/binutils/binutils.hash
+++ b/package/binutils/binutils.hash
@@ -7,9 +7,6 @@ sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d
# Locally calculated (fetched from Github)
sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz
-# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb)
-sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz
-
# locally computed
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3
sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 8ec76134bc..bfad25422d 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -21,12 +21,6 @@ BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz
BINUTILS_FROM_GIT = y
endif
-ifeq ($(BR2_csky),y)
-BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION))
-BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
-BINUTILS_FROM_GIT = y
-endif
-
BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
` (3 preceding siblings ...)
2021-10-03 12:40 ` [Buildroot] [PATCH 5/5] package/binutils: " Romain Naour
@ 2021-10-03 14:22 ` Thomas Petazzoni
2021-10-15 19:51 ` Romain Naour
2021-10-17 17:02 ` Yann E. MORIN
5 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2021-10-03 14:22 UTC (permalink / raw)
To: Romain Naour; +Cc: Guo Ren, buildroot
Hello Romain,
On Sun, 3 Oct 2021 14:40:23 +0200
Romain Naour <romain.naour@gmail.com> wrote:
> We are going to remove the gcc fork for csky since it doesn't build
> with the latest compilers (gcc 8, 10, 11 tested) [1].
>
> Removing theses defconfigs and the csky gcc fork has become unavoidable
> since the Buildroot Docker image used by the gitlab CI will switch soon
> to Debian bullseye soon [2].
>
> The cksy gcc fork based on gcc 6 has not been updated since it has been
> added to Buildroot [3]. Since then, csky has been added to binutils and
> gcc but using the latest upstream version (binutils 2.37 and gcc 11) is
> not yet possible due to build issue with glibc 2.34 [4].
>
> Moreover, qemu_csky defconfigs was to be used with the csky qemu fork
> (based on Qemu 3.x) added by commit [5] and removed by commit [6].
> Since then it's not possible to do a runtime test with theses
> defconfigs.
>
> Theses defconfigs can be added back later if the csky toolchain support
> is fixed and csky supported by upstream Qemu.
>
> [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html
> [2] 71b83227128be62c169313e85bb8f339f977ad67
> [3] 7873a5bd5ebbeb1674293dae6b06b50f0a1f2184
> [4] http://lists.busybox.net/pipermail/buildroot/2021-October/624596.html
> [5] f816e5b276f1ef15840bec6667f1e8219717ab7d
> [6] 58af9a70cc0f195116dedb3fd0e2ca5b4fec9e70
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Guo Ren <ren_guo@c-sky.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
I agree with the patch series. What I propose is to wait maybe 4-5 days
to see if there is a reaction or some feedback from Guo Ren. And if
there's no feedback, we apply in 4-5 days.
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs
2021-10-03 14:22 ` [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Thomas Petazzoni
@ 2021-10-15 19:51 ` Romain Naour
0 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2021-10-15 19:51 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Guo Ren, buildroot
Hello Thomas, All,
Le 03/10/2021 à 16:22, Thomas Petazzoni a écrit :
> Hello Romain,
>
> On Sun, 3 Oct 2021 14:40:23 +0200
> Romain Naour <romain.naour@gmail.com> wrote:
>
>> We are going to remove the gcc fork for csky since it doesn't build
>> with the latest compilers (gcc 8, 10, 11 tested) [1].
>>
>> Removing theses defconfigs and the csky gcc fork has become unavoidable
>> since the Buildroot Docker image used by the gitlab CI will switch soon
>> to Debian bullseye soon [2].
>>
>> The cksy gcc fork based on gcc 6 has not been updated since it has been
>> added to Buildroot [3]. Since then, csky has been added to binutils and
>> gcc but using the latest upstream version (binutils 2.37 and gcc 11) is
>> not yet possible due to build issue with glibc 2.34 [4].
>>
>> Moreover, qemu_csky defconfigs was to be used with the csky qemu fork
>> (based on Qemu 3.x) added by commit [5] and removed by commit [6].
>> Since then it's not possible to do a runtime test with theses
>> defconfigs.
>>
>> Theses defconfigs can be added back later if the csky toolchain support
>> is fixed and csky supported by upstream Qemu.
>>
>> [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html
>> [2] 71b83227128be62c169313e85bb8f339f977ad67
>> [3] 7873a5bd5ebbeb1674293dae6b06b50f0a1f2184
>> [4] http://lists.busybox.net/pipermail/buildroot/2021-October/624596.html
>> [5] f816e5b276f1ef15840bec6667f1e8219717ab7d
>> [6] 58af9a70cc0f195116dedb3fd0e2ca5b4fec9e70
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Cc: Guo Ren <ren_guo@c-sky.com>
>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>
> I agree with the patch series. What I propose is to wait maybe 4-5 days
> to see if there is a reaction or some feedback from Guo Ren. And if
> there's no feedback, we apply in 4-5 days.
I had a reply from Guo, we can move forward and merge this series:
http://lists.busybox.net/pipermail/buildroot/2021-October/624866.html
Best regards,
Romain
>
> Best regards,
>
> Thomas
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs
2021-10-03 12:40 [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Romain Naour
` (4 preceding siblings ...)
2021-10-03 14:22 ` [Buildroot] [PATCH 1/5] configs: remove qemu_csky defconfigs Thomas Petazzoni
@ 2021-10-17 17:02 ` Yann E. MORIN
5 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2021-10-17 17:02 UTC (permalink / raw)
To: Romain Naour; +Cc: Guo Ren, Thomas Petazzoni, buildroot
Romain, All,
On 2021-10-03 14:40 +0200, Romain Naour spake thusly:
> We are going to remove the gcc fork for csky since it doesn't build
> with the latest compilers (gcc 8, 10, 11 tested) [1].
>
> Removing theses defconfigs and the csky gcc fork has become unavoidable
> since the Buildroot Docker image used by the gitlab CI will switch soon
> to Debian bullseye soon [2].
>
> The cksy gcc fork based on gcc 6 has not been updated since it has been
> added to Buildroot [3]. Since then, csky has been added to binutils and
> gcc but using the latest upstream version (binutils 2.37 and gcc 11) is
> not yet possible due to build issue with glibc 2.34 [4].
>
> Moreover, qemu_csky defconfigs was to be used with the csky qemu fork
> (based on Qemu 3.x) added by commit [5] and removed by commit [6].
> Since then it's not possible to do a runtime test with theses
> defconfigs.
>
> Theses defconfigs can be added back later if the csky toolchain support
> is fixed and csky supported by upstream Qemu.
>
> [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html
> [2] 71b83227128be62c169313e85bb8f339f977ad67
> [3] 7873a5bd5ebbeb1674293dae6b06b50f0a1f2184
> [4] http://lists.busybox.net/pipermail/buildroot/2021-October/624596.html
> [5] f816e5b276f1ef15840bec6667f1e8219717ab7d
> [6] 58af9a70cc0f195116dedb3fd0e2ca5b4fec9e70
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Guo Ren <ren_guo@c-sky.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Series of 5 patches applied to master, thanks.
I've added the Ack from Guo to each patch, as seen in [0].
http://lists.busybox.net/pipermail/buildroot/2021-October/624866.html
Regards,
Yann E. MORIN.
> ---
> board/qemu/csky/linux-ck610.config.fragment | 6 ------
> board/qemu/csky/linux-ck807.config.fragment | 5 -----
> board/qemu/csky/linux-ck810.config.fragment | 5 -----
> board/qemu/csky/linux-ck860.config.fragment | 9 ---------
> board/qemu/csky/readme.txt | 15 ---------------
> configs/qemu_csky610_virt_defconfig | 20 --------------------
> configs/qemu_csky807_virt_defconfig | 20 --------------------
> configs/qemu_csky810_virt_defconfig | 20 --------------------
> configs/qemu_csky860_virt_defconfig | 20 --------------------
> 9 files changed, 120 deletions(-)
> delete mode 100644 board/qemu/csky/linux-ck610.config.fragment
> delete mode 100644 board/qemu/csky/linux-ck807.config.fragment
> delete mode 100644 board/qemu/csky/linux-ck810.config.fragment
> delete mode 100644 board/qemu/csky/linux-ck860.config.fragment
> delete mode 100644 board/qemu/csky/readme.txt
> delete mode 100644 configs/qemu_csky610_virt_defconfig
> delete mode 100644 configs/qemu_csky807_virt_defconfig
> delete mode 100644 configs/qemu_csky810_virt_defconfig
> delete mode 100644 configs/qemu_csky860_virt_defconfig
>
> diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment
> deleted file mode 100644
> index b690c7d6ec..0000000000
> --- a/board/qemu/csky/linux-ck610.config.fragment
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -CONFIG_COMPILE_TEST=y
> -CONFIG_CPU_CK610=y
> -CONFIG_CPU_PM_WAIT=y
> -CONFIG_RAM_BASE=0x10000000
> -CONFIG_CSKY_APB_INTC=y
> -CONFIG_GX6605S_TIMER=y
> diff --git a/board/qemu/csky/linux-ck807.config.fragment b/board/qemu/csky/linux-ck807.config.fragment
> deleted file mode 100644
> index b6974f0157..0000000000
> --- a/board/qemu/csky/linux-ck807.config.fragment
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -CONFIG_COMPILE_TEST=y
> -CONFIG_CPU_CK807=y
> -# CONFIG_CPU_HAS_FPU is not set
> -CONFIG_CPU_PM_WAIT=y
> -CONFIG_CSKY_APB_INTC=y
> diff --git a/board/qemu/csky/linux-ck810.config.fragment b/board/qemu/csky/linux-ck810.config.fragment
> deleted file mode 100644
> index 50fa1f4f79..0000000000
> --- a/board/qemu/csky/linux-ck810.config.fragment
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -CONFIG_COMPILE_TEST=y
> -CONFIG_CPU_CK810=y
> -# CONFIG_CPU_HAS_FPU is not set
> -CONFIG_CPU_PM_WAIT=y
> -CONFIG_CSKY_APB_INTC=y
> diff --git a/board/qemu/csky/linux-ck860.config.fragment b/board/qemu/csky/linux-ck860.config.fragment
> deleted file mode 100644
> index e8f6af10ba..0000000000
> --- a/board/qemu/csky/linux-ck860.config.fragment
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -CONFIG_COMPILE_TEST=y
> -CONFIG_CPU_CK860=y
> -# CONFIG_CPU_HAS_FPU is not set
> -CONFIG_CPU_PM_WAIT=y
> -CONFIG_SMP=y
> -CONFIG_HOTPLUG_CPU=y
> -CONFIG_CSKY_APB_INTC=y
> -CONFIG_CSKY_MPINTC=y
> -CONFIG_CSKY_MP_TIMER=y
> diff --git a/board/qemu/csky/readme.txt b/board/qemu/csky/readme.txt
> deleted file mode 100644
> index 5e4cb1871c..0000000000
> --- a/board/qemu/csky/readme.txt
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Run with qemu:
> -
> -For ck860 smp:
> - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux # qemu_csky860_virt_defconfig
> -
> -For ck807:
> - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky807_virt_defconfig
> -
> -For ck810:
> - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky810_virt_defconfig
> -
> -For ck610:
> - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux # qemu_csky610_virt_defconfig
> -
> -The login prompt will appear in the terminal that started Qemu. Username is root and no password.
> diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig
> deleted file mode 100644
> index e7d75f5f49..0000000000
> --- a/configs/qemu_csky610_virt_defconfig
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# Architecture
> -BR2_csky=y
> -BR2_ck610=y
> -
> -# System
> -BR2_TARGET_ROOTFS_INITRAMFS=y
> -
> -# Image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
> -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
> -
> -# linux kernel header, the same version with linux kernel
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
> -
> -# Kernel
> -BR2_LINUX_KERNEL=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12"
> -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment"
> diff --git a/configs/qemu_csky807_virt_defconfig b/configs/qemu_csky807_virt_defconfig
> deleted file mode 100644
> index df12450a55..0000000000
> --- a/configs/qemu_csky807_virt_defconfig
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# Architecture
> -BR2_csky=y
> -BR2_ck807=y
> -
> -# System
> -BR2_TARGET_ROOTFS_INITRAMFS=y
> -
> -# Image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
> -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
> -
> -# linux kernel header, the same version with linux kernel
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
> -
> -# Kernel
> -BR2_LINUX_KERNEL=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12"
> -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment"
> diff --git a/configs/qemu_csky810_virt_defconfig b/configs/qemu_csky810_virt_defconfig
> deleted file mode 100644
> index dd1fd329f5..0000000000
> --- a/configs/qemu_csky810_virt_defconfig
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# Architecture
> -BR2_csky=y
> -BR2_ck810=y
> -
> -# System
> -BR2_TARGET_ROOTFS_INITRAMFS=y
> -
> -# Image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
> -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
> -
> -# linux kernel header, the same version with linux kernel
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
> -
> -# Kernel
> -BR2_LINUX_KERNEL=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12"
> -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment"
> diff --git a/configs/qemu_csky860_virt_defconfig b/configs/qemu_csky860_virt_defconfig
> deleted file mode 100644
> index 6edfba4e8e..0000000000
> --- a/configs/qemu_csky860_virt_defconfig
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# Architecture
> -BR2_csky=y
> -BR2_ck860=y
> -
> -# System
> -BR2_TARGET_ROOTFS_INITRAMFS=y
> -
> -# Image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh"
> -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
> -
> -# linux kernel header, the same version with linux kernel
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
> -
> -# Kernel
> -BR2_LINUX_KERNEL=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12"
> -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment"
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 9+ messages in thread