diff options
| author | Peter Marko <peter.marko@siemens.com> | 2026-04-08 11:32:15 +0200 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-10 07:59:51 -0700 |
| commit | a322194016f0cc48a6809e89532a2051a684ea1e (patch) | |
| tree | 3a7c0b0fef3d690b056726f40a22d9d7d0e7832f | |
| parent | c90f0128555752cd065eaebcd91e1851a0d453b6 (diff) | |
| download | meta-openembedded-a322194016f0cc48a6809e89532a2051a684ea1e.tar.gz | |
poco: fix powerpc build
Add patch which was also submitted upstream to quill.
Poco should get it when they update quill component.
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-support/poco/poco_1.15.1.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch new file mode 100644 index 0000000000..734b65efa2 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From dce2cc2886a9097971856e69737cc5c05c9239ea Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Marko <peter.marko@siemens.com> | ||
| 3 | Date: Wed, 8 Apr 2026 10:54:25 +0200 | ||
| 4 | Subject: [PATCH] quill: use soft rdtsc fallback on 32-bit PowerPC | ||
| 5 | |||
| 6 | Quill's rdtsc helper already avoids __rdtsc() on ARM and PPC64, but | ||
| 7 | 32-bit PowerPC was not included in that guard. On powerpc targets this | ||
| 8 | falls through to the x86-specific intrinsic and fails with: | ||
| 9 | |||
| 10 | error: '__rdtsc' was not declared in this scope | ||
| 11 | |||
| 12 | Treat common 32-bit PowerPC compiler define the same way as PPC64 and | ||
| 13 | use the existing steady_clock-based fallback. | ||
| 14 | |||
| 15 | Upstream-Status: Submitted [https://github.com/odygrd/quill/pull/911] | ||
| 16 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
| 17 | --- | ||
| 18 | dependencies/quill/include/quill/core/Rdtsc.h | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/dependencies/quill/include/quill/core/Rdtsc.h b/dependencies/quill/include/quill/core/Rdtsc.h | ||
| 22 | index 3d0ae9f26..67f26cb89 100644 | ||
| 23 | --- a/dependencies/quill/include/quill/core/Rdtsc.h | ||
| 24 | +++ b/dependencies/quill/include/quill/core/Rdtsc.h | ||
| 25 | @@ -100,7 +100,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept | ||
| 26 | __asm__ volatile("stck %0" : "=Q"(tsc) : : "cc"); | ||
| 27 | return tsc; | ||
| 28 | } | ||
| 29 | -#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__)) | ||
| 30 | +#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__) || defined(__PPC__)) | ||
| 31 | QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept | ||
| 32 | { | ||
| 33 | // soft failover | ||
| 34 | -- | ||
| 35 | 2.47.2 | ||
diff --git a/meta-oe/recipes-support/poco/poco_1.15.1.bb b/meta-oe/recipes-support/poco/poco_1.15.1.bb index 7dd87606ef..35fd13f538 100644 --- a/meta-oe/recipes-support/poco/poco_1.15.1.bb +++ b/meta-oe/recipes-support/poco/poco_1.15.1.bb | |||
| @@ -11,6 +11,7 @@ DEPENDS = "libpcre2 utf8proc zlib" | |||
| 11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=https;tag=poco-${PV}-release \ | 11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=https;tag=poco-${PV}-release \ |
| 12 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ | 12 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ |
| 13 | file://0002-DataTest-disable-testSQLChannel-test.patch \ | 13 | file://0002-DataTest-disable-testSQLChannel-test.patch \ |
| 14 | file://0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch \ | ||
| 14 | file://run-ptest \ | 15 | file://run-ptest \ |
| 15 | " | 16 | " |
| 16 | SRCREV = "a1aacbba1bda4301db01bb1a2c2ab80677756b90" | 17 | SRCREV = "a1aacbba1bda4301db01bb1a2c2ab80677756b90" |
