diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-06-30 19:19:15 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-07-01 01:11:42 -0700 |
| commit | f7d32f43d8c9aa4cba04753f412f04e69ed4b524 (patch) | |
| tree | 20d511061ce4d0262e1b13fc16e4f677851b6564 /utils/openocd | |
| parent | c11726f14a996e9085ef5d6cb785e8c5f2c4e174 (diff) | |
openocd: fix compilation with GCC10
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'utils/openocd')
| -rw-r--r-- | utils/openocd/Makefile | 2 | ||||
| -rw-r--r-- | utils/openocd/patches/010-gcc10.patch | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/utils/openocd/Makefile b/utils/openocd/Makefile index c8a6544b5..30c2e8368 100644 --- a/utils/openocd/Makefile +++ b/utils/openocd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openocd PKG_SOURCE_VERSION:=v0.10.0-1000-gdb23c13d PKG_VERSION:=$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/utils/openocd/patches/010-gcc10.patch b/utils/openocd/patches/010-gcc10.patch new file mode 100644 index 000000000..9bfb61028 --- /dev/null +++ b/utils/openocd/patches/010-gcc10.patch @@ -0,0 +1,31 @@ +From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 +From: Andreas Fritiofson <andreas.fritiofson@gmail.com> +Date: Fri, 17 Apr 2020 13:49:28 +0200 +Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 + +GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd +struct between bitbang drivers due to a missing extern. + +Change-Id: I2b4122f7939cec91a72284006748f99a23548324 +Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> +Reviewed-on: http://openocd.zylin.com/5592 +Tested-by: jenkins +Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com> +Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li> +--- + src/jtag/drivers/bitbang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +index edb779c..bbbc693 100644 +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -57,7 +57,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + |