Bug#997271: xnnpack: diff for NMU version 0.0~git20201221.e1ffe15-2.1
Control: tags 997271 + patch
Control: tags 997271 + pending
Dear maintainer,
I've prepared an NMU for xnnpack (versioned as 0.0~git20201221.e1ffe15-2.1)
and uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru xnnpack-0.0~git20201221.e1ffe15/debian/changelog xnnpack-0.0~git20201221.e1ffe15/debian/changelog
--- xnnpack-0.0~git20201221.e1ffe15/debian/changelog 2021-09-02 05:12:54.000000000 +0300
+++ xnnpack-0.0~git20201221.e1ffe15/debian/changelog 2021-12-28 20:29:08.000000000 +0200
@@ -1,3 +1,10 @@
+xnnpack (0.0~git20201221.e1ffe15-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with gcc 11. (Closes: #997271)
+
+ -- Adrian Bunk <bunk@debian.org> Tue, 28 Dec 2021 20:29:08 +0200
+
xnnpack (0.0~git20201221.e1ffe15-2) unstable; urgency=medium
* Upload to unstable.
diff -Nru xnnpack-0.0~git20201221.e1ffe15/debian/patches/0001-GCC-11-no-longer-needs-this-polyfill.patch xnnpack-0.0~git20201221.e1ffe15/debian/patches/0001-GCC-11-no-longer-needs-this-polyfill.patch
--- xnnpack-0.0~git20201221.e1ffe15/debian/patches/0001-GCC-11-no-longer-needs-this-polyfill.patch 1970-01-01 02:00:00.000000000 +0200
+++ xnnpack-0.0~git20201221.e1ffe15/debian/patches/0001-GCC-11-no-longer-needs-this-polyfill.patch 2021-12-28 20:28:46.000000000 +0200
@@ -0,0 +1,36 @@
+From 042cdaf1c24c675fca5e79eb4d2665839d7df2c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nenad=20Miks=CC=8Ca?= <nenad.miksa@microblink.com>
+Date: Mon, 3 May 2021 13:28:59 +0200
+Subject: GCC 11 no longer needs this polyfill
+
+---
+ src/xnnpack/intrinsics-polyfill.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/xnnpack/intrinsics-polyfill.h b/src/xnnpack/intrinsics-polyfill.h
+index 3f198d88..32d7d4f3 100644
+--- a/src/xnnpack/intrinsics-polyfill.h
++++ b/src/xnnpack/intrinsics-polyfill.h
+@@ -11,8 +11,8 @@
+ #if defined(__SSE2__)
+ #include <emmintrin.h>
+
+-// GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
+-#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)) || \
++// GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
++#if (defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ < 11) || \
+ (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ < 8)) || \
+ (defined(__clang__) && defined(__ANDROID__) && (__clang_major__ == 8) && (__clang_minor__ == 0) && (__clang_patchlevel__ < 7)) || \
+ (defined(__clang__) && defined(__apple_build_version__) && (__apple_build_version__ < 11000000)) || \
+@@ -27,7 +27,7 @@ static XNN_INTRINSIC
+ void _mm_storeu_si32(const void* address, __m128i v) {
+ *((int*) address) = _mm_cvtsi128_si32(v);
+ }
+-#endif // GCC any, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
++#endif // GCC pre-11, Clang pre-8, Android NDK Clang pre-8.0.7, Apple Clang pre-11, and ICC pre-16
+ #endif // SSE2
+
+ #ifdef __AVX512F__
+--
+2.20.1
+
diff -Nru xnnpack-0.0~git20201221.e1ffe15/debian/patches/series xnnpack-0.0~git20201221.e1ffe15/debian/patches/series
--- xnnpack-0.0~git20201221.e1ffe15/debian/patches/series 2021-09-02 05:12:36.000000000 +0300
+++ xnnpack-0.0~git20201221.e1ffe15/debian/patches/series 2021-12-28 20:29:07.000000000 +0200
@@ -1,2 +1,3 @@
0001-Fix-bug-in-NHWC-Convolution-with-depthwise-kernels.patch
soversion.patch
+0001-GCC-11-no-longer-needs-this-polyfill.patch
Reply to: