f358f322da
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Mon, 15 Feb 2021 20:17:43 +0100
|
|
Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11
|
|
|
|
Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and
|
|
https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235:
|
|
|
|
FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o
|
|
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c
|
|
../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv':
|
|
../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'?
|
|
164 | if (buf[i] == AT_L1D_CACHESIZE) {
|
|
| ^~~~~~~~~~~~~~~~
|
|
| AT_DCACHEBSIZE
|
|
../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in
|
|
../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'?
|
|
168 | if (buf[i] == AT_L2_CACHESIZE) {
|
|
| ^~~~~~~~~~~~~~~
|
|
| AT_ICACHEBSIZE
|
|
../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'?
|
|
172 | if (buf[i] == AT_L3_CACHESIZE) {
|
|
| ^~~~~~~~~~~~~~~
|
|
| AT_ICACHEBSIZE
|
|
|
|
Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and
|
|
https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56]
|
|
---
|
|
orc/orccpu-powerpc.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c
|
|
index 6796f17..340cf05 100644
|
|
--- a/orc/orccpu-powerpc.c
|
|
+++ b/orc/orccpu-powerpc.c
|
|
@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void)
|
|
_orc_cpu_name = (char*)buf[i + 1];
|
|
found++;
|
|
}
|
|
+#ifdef AT_L1D_CACHESIZE
|
|
if (buf[i] == AT_L1D_CACHESIZE) {
|
|
_orc_data_cache_size_level1 = buf[i + 1];
|
|
found++;
|
|
}
|
|
+#endif
|
|
+#ifdef AT_L2_CACHESIZE
|
|
if (buf[i] == AT_L2_CACHESIZE) {
|
|
_orc_data_cache_size_level2 = buf[i + 1];
|
|
found++;
|
|
}
|
|
+#endif
|
|
+#ifdef AT_L3_CACHESIZE
|
|
if (buf[i] == AT_L3_CACHESIZE) {
|
|
_orc_data_cache_size_level3 = buf[i + 1];
|
|
found++;
|
|
}
|
|
+#endif
|
|
if (found == 6)
|
|
break;
|
|
}
|
|
--
|
|
2.30.0
|
|
|