From d00306f63f92e9d8f05a00595720beef008aadcf Mon Sep 17 00:00:00 2001
From: Guillaume_G <>
Date: Oct 25 2021 13:39:12 +0000
Subject: Update armnn to version 21.08 / rev 21 via SR 927254


https://build.opensuse.org/request/show/927254
by user Guillaume_G + dimstar_suse

---

diff --git a/.files b/.files
index 1f183bf..5f6098b 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 7aed6ed..ac264b9 100644
--- a/.rev
+++ b/.rev
@@ -191,4 +191,12 @@
     <comment></comment>
     <requestid>926807</requestid>
   </revision>
+  <revision rev="21" vrev="4">
+    <srcmd5>1f0915ef871f1d1eb412064466b732a0</srcmd5>
+    <version>21.08</version>
+    <time>1635167857</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>927254</requestid>
+  </revision>
 </revisionlist>
diff --git a/armnn.changes b/armnn.changes
index c8c3232..53faba1 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Oct 25 07:21:27 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add upstream patch to fix stringop-overread error:
+  * e118e04.diff
+
+-------------------------------------------------------------------
 Thu Oct 21 15:24:42 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
 - Add upstream patch to fix uninitialized var error:
diff --git a/armnn.spec b/armnn.spec
index a1b0a4b..666da3b 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -81,8 +81,10 @@ Source1:        armnn-rpmlintrc
 Patch1:         96beb97.diff
 # PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/548
 Patch2:         febc20f.diff
+# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/548
+Patch3:         e118e04.diff
 # PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/581
-Patch3:         0011-update-doctest-for-glibc2.34.patch
+Patch4:         0011-update-doctest-for-glibc2.34.patch
 # PATCHES to add downstream ArmnnExamples binary - https://layers.openembedded.org/layerindex/recipe/87610/
 Patch200:       0003-add-more-test-command-line-arguments.patch
 Patch201:       0005-add-armnn-mobilenet-test-example.patch
@@ -356,10 +358,11 @@ This package contains the libarmnnOnnxParser library from armnn.
 %if %{pkg_vcmp tensorflow2-lite-devel >= 2.4}
 # This patch breaks build on TF < 2.4
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %endif
 %endif
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 %if %{with armnn_extra_tests}
 %patch200 -p1
 %patch201 -p1
@@ -380,7 +383,7 @@ protoc $PROTO --proto_path=. --proto_path=%{_includedir} --proto_path=$(dirname 
 %cmake \
   -DCMAKE_SKIP_RPATH=True \
   -DSHARED_BOOST=1 \
-  -DCMAKE_CXX_FLAGS:STRING="%{optflags} -pthread -Wno-error=stringop-overread -Wno-error=deprecated-declarations" \
+  -DCMAKE_CXX_FLAGS:STRING="%{optflags} -pthread " \
   -DBOOST_LIBRARYDIR=%{_libdir} \
 %if %{with armnn_onnx}
   -DBUILD_ONNX_PARSER=ON \
diff --git a/e118e04.diff b/e118e04.diff
new file mode 100644
index 0000000..aef5a38
--- /dev/null
+++ b/e118e04.diff
@@ -0,0 +1,25 @@
+From e118e0423d6ec95c9894a987db671844f8220117 Mon Sep 17 00:00:00 2001
+From: Francis Murtagh <francis.murtagh@arm.com>
+Date: Fri, 22 Oct 2021 18:06:32 +0100
+Subject: [PATCH] Bugfix: GCC-11 stringop-overread warning treated as error
+
+ * Occured in Ubuntu Impish
+ * GCC Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578
+
+Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
+Change-Id: Ic2b1ae64bb2f1362ec3eb5c2b7a829deee2e9018
+---
+
+diff --git a/src/backends/cl/ClContextDeserializer.cpp b/src/backends/cl/ClContextDeserializer.cpp
+index 8a1b585..35a8afa 100644
+--- a/src/backends/cl/ClContextDeserializer.cpp
++++ b/src/backends/cl/ClContextDeserializer.cpp
+@@ -65,7 +65,7 @@
+ 
+     for (Program const* program : *clContext->programs())
+     {
+-        auto programName = program->name()->c_str();
++        const char* volatile programName = program->name()->c_str();
+         auto programBinary = program->binary();
+         std::vector<uint8_t> binary(programBinary->begin(), programBinary->begin() + programBinary->size());
+