58af9a70cc
We have a qemu fork for csky cpus [1] but since qemu version bump to 4.2.0 [2] and libssh2/libssh change the csky build is broken. The csky fork is based on Qemu 3.0.0 but unlike autotools packages any unknown option is handled as error. Since we don't want to support all options from previous qemu release and the github repository has been removed [3] and the only remaining archive is located on http://sources.buildroot.net, remove the qemu csky fork as suggested by [4]. [1] https://git.buildroot.net/buildroot/commit/?id=f816e5b276f1ef15840bec6667f1e8219717ab7d [2] https://git.buildroot.net/buildroot/commit/?id=0ea17054ce7dfc54efca5634133cef786445e7b1 [3] https://github.com/c-sky/qemu [4] http://lists.busybox.net/pipermail/buildroot/2020-May/281885.html Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Guo Ren <ren_guo@c-sky.com> Cc: Peter Korsgaard <peter@korsgaard.com> [Peter: move patches out of 4.2.0 subdir] Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From d82b8540ecaf3cb09a033e4971d8645d3343211e Mon Sep 17 00:00:00 2001
|
|
From: Carlos Santos <casantos@redhat.com>
|
|
Date: Wed, 16 Oct 2019 22:27:30 -0300
|
|
Subject: [PATCH] util/cacheinfo: fix crash when compiling with uClibc
|
|
|
|
uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE
|
|
but the corresponding sysconf calls returns -1, which is a valid result,
|
|
meaning that the limit is indeterminate.
|
|
|
|
Handle this situation using the fallback values instead of crashing due
|
|
to an assertion failure.
|
|
|
|
Signed-off-by: Carlos Santos <casantos@redhat.com>
|
|
---
|
|
util/cacheinfo.c | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/cacheinfo.c b/util/cacheinfo.c
|
|
index ea6f3e99bf..d94dc6adc8 100644
|
|
--- a/util/cacheinfo.c
|
|
+++ b/util/cacheinfo.c
|
|
@@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize)
|
|
static void sys_cache_info(int *isize, int *dsize)
|
|
{
|
|
# ifdef _SC_LEVEL1_ICACHE_LINESIZE
|
|
- *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
|
|
+ int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE);
|
|
+ if (tmp_isize > 0) {
|
|
+ *isize = tmp_isize;
|
|
+ }
|
|
# endif
|
|
# ifdef _SC_LEVEL1_DCACHE_LINESIZE
|
|
- *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
|
|
+ int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
|
|
+ if (tmp_dsize > 0) {
|
|
+ *dsize = tmp_dsize;
|
|
+ }
|
|
# endif
|
|
}
|
|
#endif /* sys_cache_info */
|
|
--
|
|
2.18.1
|
|
|