development/openocd: Updated for version 0.11.0.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 90 insertions, 5 deletions

diff --git a/development/openocd/0001-build-remove-warnings-with-gcc-11.patch b/development/openocd/0001-build-remove-warnings-with-gcc-11.patch
new file mode 100644
index 0000000000..3b384bf6e9
--- /dev/null
+++ b/development/openocd/0001-build-remove-warnings-with-gcc-11.patch
@@ -0,0 +1,83 @@
+From 6db49eb8858023654084088c73d968e190aec491 Mon Sep 17 00:00:00 2001
+From: Rene Kita <git@rkta.de>
+Date: Fri, 12 Mar 2021 18:38:02 +0100
+Subject: [PATCH] build: remove warnings with gcc 11
+
+This removes some warnings which prevent a successful build with -Werror
+which is enabled by default. I'm using gcc 11, so maybe others are not
+getting this warnings yet.
+
+In src/flash/nor/numicro.c the debug messages were misleadingly indented.
+In src/target/arm920t.c the array size where smaller than expected from
+the receiving function.
+
+Change-Id: I66f5c6a63beb9f9416e73b726299297476c884d8
+Signed-off-by: Rene Kita <git@rkta.de>
+Reviewed-on: http://openocd.zylin.com/6104
+Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
+Tested-by: jenkins
+Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
+Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
+---
+ src/flash/nor/numicro.c | 6 +++---
+ src/target/arm920t.c    | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
+index 7609fa81c..1971daa24 100644
+--- a/src/flash/nor/numicro.c
++++ b/src/flash/nor/numicro.c
+@@ -1243,7 +1243,7 @@ static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t ad
+ 		retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
+ 		if (retval != ERROR_OK)
+ 			return retval;
+-			LOG_DEBUG("status: 0x%" PRIx32 "", status);
++		LOG_DEBUG("status: 0x%" PRIx32 "", status);
+ 		if ((status & (ISPTRG_ISPGO)) == 0)
+ 			break;
+ 		if (timeout-- <= 0) {
+@@ -1512,7 +1512,7 @@ static int numicro_erase(struct flash_bank *bank, unsigned int first,
+ 			retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
+ 			if (retval != ERROR_OK)
+ 				return retval;
+-				LOG_DEBUG("status: 0x%" PRIx32 "", status);
++			LOG_DEBUG("status: 0x%" PRIx32 "", status);
+ 			if (status == 0)
+ 				break;
+ 			if (timeout-- <= 0) {
+@@ -1601,7 +1601,7 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer,
+ 				retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
+ 				if (retval != ERROR_OK)
+ 					return retval;
+-					LOG_DEBUG("status: 0x%" PRIx32 "", status);
++				LOG_DEBUG("status: 0x%" PRIx32 "", status);
+ 				if (status == 0)
+ 					break;
+ 				if (timeout-- <= 0) {
+diff --git a/src/target/arm920t.c b/src/target/arm920t.c
+index 80f6d7045..a45dc6420 100644
+--- a/src/target/arm920t.c
++++ b/src/target/arm920t.c
+@@ -245,8 +245,8 @@ static int arm920t_read_cp15_interpreted(struct target *target,
+ 	uint32_t cp15_opcode, uint32_t address, uint32_t *value)
+ {
+ 	struct arm *arm = target_to_arm(target);
+-	uint32_t *regs_p[1];
+-	uint32_t regs[2];
++	uint32_t *regs_p[16];
++	uint32_t regs[16];
+ 	uint32_t cp15c15 = 0x0;
+ 	struct reg *r = arm->core_cache->reg_list;
+ 
+@@ -295,7 +295,7 @@ int arm920t_write_cp15_interpreted(struct target *target,
+ {
+ 	uint32_t cp15c15 = 0x0;
+ 	struct arm *arm = target_to_arm(target);
+-	uint32_t regs[2];
++	uint32_t regs[16];
+ 	struct reg *r = arm->core_cache->reg_list;
+ 
+ 	/* load value, address into R0, R1 */
+-- 
+2.35.1
+
diff --git a/development/openocd/openocd.SlackBuild b/development/openocd/openocd.SlackBuild
index 18b65e69f9..bbdef1bb78 100644
--- a/development/openocd/openocd.SlackBuild
+++ b/development/openocd/openocd.SlackBuild
@@ -7,7 +7,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openocd
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -61,7 +61,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough= -Wno-error=format-truncation= -Wno-error=format-overflow=" \
+patch -p1 < $CWD/0001-build-remove-warnings-with-gcc-11.patch
+
+CFLAGS="$SLKCFLAGS -Wno-error" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/development/openocd/openocd.info b/development/openocd/openocd.info
index a1d7add762..a3d5512a81 100644
--- a/development/openocd/openocd.info
+++ b/development/openocd/openocd.info
@@ -1,8 +1,8 @@
 PRGNAM="openocd"
-VERSION="0.10.0"
+VERSION="0.11.0"
 HOMEPAGE="http://openocd.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/openocd/openocd-0.10.0.tar.gz"
-MD5SUM="8971d16aee5c2642b33ee55fc6c86239"
+DOWNLOAD="http://downloads.sourceforge.net/openocd/openocd-0.11.0.tar.gz"
+MD5SUM="32147d5b2d269da1f7326669fce94ddc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""