Aaron M. Ucko pushed to branch master at Debian Med / sra-sdk
Commits: 2b50228c by Aaron M. Ucko at 2024-04-12T19:32:52-04:00 sra-sdk 3.0.9+dfsg-2: Add fix_arm64_build.patch. Fix arm64 builds by tweaking BitMagic to treat __aarch64__ like __arm64__. - - - - - 3 changed files: - debian/changelog - + debian/patches/fix_arm64_build.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +sra-sdk (3.0.9+dfsg-2) experimental; urgency=medium + + * debian/patches/fix_arm64_build.patch (new): Fix arm64 builds by + tweaking BitMagic to treat __aarch64__ like __arm64__. + + -- Aaron M. Ucko <u...@debian.org> Fri, 12 Apr 2024 19:32:51 -0400 + sra-sdk (3.0.9+dfsg-1) experimental; urgency=medium [ Andreas Tille ] ===================================== debian/patches/fix_arm64_build.patch ===================================== @@ -0,0 +1,49 @@ +Index: b/libs/inc/bm/bmsse2.h +=================================================================== +--- a/libs/inc/bm/bmsse2.h ++++ b/libs/inc/bm/bmsse2.h +@@ -22,7 +22,7 @@ For more information please visit: http + \brief Compute functions for SSE2 SIMD instruction set (internal) + */ + +-#if !defined(__arm64__) && !defined(__arm__) ++#if !defined(__aarch64__) && !defined(__arm64__) && !defined(__arm__) + #ifndef BMWASMSIMDOPT + #include<mmintrin.h> + #endif +Index: b/libs/inc/bm/bmutil.h +=================================================================== +--- a/libs/inc/bm/bmutil.h ++++ b/libs/inc/bm/bmutil.h +@@ -26,7 +26,7 @@ For more information please visit: http + #include "bmdef.h" + #include "bmconst.h" + +-#if defined(__arm64__) || defined(__arm__) ++#if defined(__aarch64__) || defined(__arm64__) || defined(__arm__) + //#include "sse2neon.h" + #else + #if defined(_M_AMD64) || defined(_M_X64) +@@ -611,7 +611,7 @@ unsigned word_bitcount64(bm::id64_t x) B + return _mm_popcnt_u32(x >> 32) + _mm_popcnt_u32((unsigned)x); + #endif + #else +- #if defined(BM_USE_GCC_BUILD) || defined(__arm64__) ++ #if defined(BM_USE_GCC_BUILD) || defined(__aarch64__) || defined(__arm64__) + return (unsigned)__builtin_popcountll(x); + #else + #if (defined(__arm__)) // 32-bit +Index: b/libs/inc/bm/encoding.h +=================================================================== +--- a/libs/inc/bm/encoding.h ++++ b/libs/inc/bm/encoding.h +@@ -1810,7 +1810,8 @@ unsigned bit_in<TDecoder>::gamma() BMNOE + continue; + } + unsigned first_bit_idx = +- #if defined(BM_x86) && (defined(__GNUG__) || defined(_MSC_VER)) && !(defined(__arm64__) || defined(__arm__)) ++ #if defined(BM_x86) && (defined(__GNUG__) || defined(_MSC_VER)) && \ ++ !defined(__aarch64__) || (defined(__arm64__) || defined(__arm__)) + bm::bsf_asm32(acc); + #else + bm::bit_scan_fwd(acc); ===================================== debian/patches/series ===================================== @@ -38,3 +38,4 @@ prefer_dynamic_libraries.patch fix_ngs-c++-underlinkage.patch use_c_locale_for_comma.patch no_sse4.2.patch +fix_arm64_build.patch View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/commit/2b50228c25c245cc6672411284719fd6b739bcba -- View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/commit/2b50228c25c245cc6672411284719fd6b739bcba You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit