From d832ee79631ac1502b107091cdcfd8f88237d533 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Mon, 23 Dec 2024 11:20:52 -0500 Subject: python3: upgrade 3.13.0 -> 3.13.1 Changelog: https://docs.python.org/3/whatsnew/changelog.html#python-3-13-1-final - Patch 'fix-armv5.patch' is in 3.13.1, so no longer needed: |tgamblin@megalith ~/workspace/git/pythonsrc/cpython ((HEAD detached from v3.13.1))$ git tag --contains 18b9079ddbc149d6b99c922630c246812e4d8ae7 |v3.13.1 - While patch 'crosspythonpath.patch' is listed as 'Inappropriate [OE-Core integration specific]' specific in the commit message, it is now breaking the build, while removing it allows python3 to build OK. It appears that there is a similar change in upstream 3.13.1: https://github.com/python/cpython/commit/909d5ac2959e - gcc-symlinks had to be added to ptest RDEPENDS so that 'gcc' could be found on the path for the test_ctypes.test_dlerror.TestNullDlsym.test_null_dlsym test. - Also reformat the DEPENDS and RDEPENDS lists to be alphabetical and one-per-line, since that's easier to read and modify. - buildall-qemu output: |BUILDALL-QEMU LOG FOR python3 |START TIME: 2024-12-18_20:38:01 |HOSTNAME: megalith |HOST OS: Debian GNU/Linux 12 (bookworm) |HOST KERNEL: 6.1.0-28-amd64 |=============== |BUILD RESULTS: |[glibc] |FAIL: qemuloongarch64 |PASS: qemuriscv32 |PASS: qemuarmv5 |PASS: qemuppc |PASS: qemumips64 |PASS: qemuriscv64 |PASS: qemuarm64 |PASS: qemuarm |PASS: qemux86-64 |PASS: qemuppc64 |PASS: qemux86 |PASS: qemumips |[musl] |FAIL: qemuloongarch64 |FAIL: qemuriscv32 |PASS: qemuarmv5 |PASS: qemuppc |PASS: qemumips64 |PASS: qemuriscv64 |PASS: qemuarm64 |PASS: qemuarm |PASS: qemux86-64 |PASS: qemuppc64 |PASS: qemux86 |PASS: qemumips |=============== |PASSED: 21 |FAILED: 3 (From OE-Core rev: 08c44d3b140b220ead6334db26097b28612d445a) Signed-off-by: Trevor Gamblin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../python/python3/fix-armv5.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/fix-armv5.patch (limited to 'meta/recipes-devtools/python/python3/fix-armv5.patch') diff --git a/meta/recipes-devtools/python/python3/fix-armv5.patch b/meta/recipes-devtools/python/python3/fix-armv5.patch deleted file mode 100644 index 961404b24f..0000000000 --- a/meta/recipes-devtools/python/python3/fix-armv5.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 18b9079ddbc149d6b99c922630c246812e4d8ae7 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Wed, 16 Oct 2024 16:48:40 +0200 -Subject: [PATCH] [3.13] gh-125444: Fix illegal instruction for older Arm - architectures (GH-125574) (GH-125595) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Arm v5 it is not possible to get the thread ID via c13 register -hence the illegal instruction. The c13 register started to provide -thread ID since Arm v6K architecture variant. Other variants of -Arm v6 (T2, Z and base) don’t provide the thread ID via c13. -For the sake of simplicity we group v5 and v6 together and -consider that instructions for Arm v7 only. -(cherry picked from commit feda9aa73ab95d17a291db22c416146f8e70edeb) - -Co-authored-by: Diego Russo - -Upstream-Status: Backport [https://github.com/python/cpython/commit/18b9079ddbc149d6b99c922630c246812e4d8ae7] -Signed-off-by: Alexander Kanavin ---- - Include/internal/mimalloc/mimalloc/prim.h | 4 ++-- - Include/object.h | 2 +- - .../2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst | 1 + - 3 files changed, 4 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst - -diff --git a/Include/internal/mimalloc/mimalloc/prim.h b/Include/internal/mimalloc/mimalloc/prim.h -index 8a60d528458e6c..322ab29e6b41c2 100644 ---- a/Include/internal/mimalloc/mimalloc/prim.h -+++ b/Include/internal/mimalloc/mimalloc/prim.h -@@ -151,9 +151,9 @@ static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept { - // If you test on another platform and it works please send a PR :-) - // see also https://akkadia.org/drepper/tls.pdf for more info on the TLS register. - #elif defined(__GNUC__) && ( \ -- (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ -+ (defined(__GLIBC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ - || (defined(__APPLE__) && (defined(__x86_64__) || defined(__aarch64__))) \ -- || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \ -+ || (defined(__BIONIC__) && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \ - || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ - || (defined(__OpenBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \ - ) -diff --git a/Include/object.h b/Include/object.h -index 78aa7ad0f459ff..b53f9acfebdb0c 100644 ---- a/Include/object.h -+++ b/Include/object.h -@@ -259,7 +259,7 @@ _Py_ThreadId(void) - __asm__("movq %%gs:0, %0" : "=r" (tid)); // x86_64 macOSX uses GS - #elif defined(__x86_64__) - __asm__("movq %%fs:0, %0" : "=r" (tid)); // x86_64 Linux, BSD uses FS --#elif defined(__arm__) -+#elif defined(__arm__) && __ARM_ARCH >= 7 - __asm__ ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tid)); - #elif defined(__aarch64__) && defined(__APPLE__) - __asm__ ("mrs %0, tpidrro_el0" : "=r" (tid)); -diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst -new file mode 100644 -index 00000000000000..13c1e745edf8d5 ---- /dev/null -+++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-10-16-12-12-39.gh-issue-125444.9tG2X6.rst -@@ -0,0 +1 @@ -+Fix illegal instruction for older Arm architectures. Patch by Diego Russo, testing by Ross Burton. -- cgit v1.2.3-54-g00ecf