From 87b5717ff3e196e510e75e84f207cee54a4a2cc4 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 24 May 2020 12:00:44 +0200 Subject: openocd: add upstream patch to build with gcc 10 Signed-off-by: Michael Olbrich --- .../0001-bitbang-Fix-FTBFS-with-GCC-10.patch | 30 ++++++++++++++++++++++ patches/openocd-0.10.0-870-gaf952850b549/series | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 patches/openocd-0.10.0-870-gaf952850b549/0001-bitbang-Fix-FTBFS-with-GCC-10.patch create mode 100644 patches/openocd-0.10.0-870-gaf952850b549/series diff --git a/patches/openocd-0.10.0-870-gaf952850b549/0001-bitbang-Fix-FTBFS-with-GCC-10.patch b/patches/openocd-0.10.0-870-gaf952850b549/0001-bitbang-Fix-FTBFS-with-GCC-10.patch new file mode 100644 index 000000000..dbfa93e80 --- /dev/null +++ b/patches/openocd-0.10.0-870-gaf952850b549/0001-bitbang-Fix-FTBFS-with-GCC-10.patch @@ -0,0 +1,30 @@ +From: Andreas Fritiofson +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 +Reviewed-on: http://openocd.zylin.com/5592 +Tested-by: jenkins +Reviewed-by: Antonio Borneo +Reviewed-by: Jonathan McDowell +--- + 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 577717ebd241..0faf5d9ae055 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; + diff --git a/patches/openocd-0.10.0-870-gaf952850b549/series b/patches/openocd-0.10.0-870-gaf952850b549/series new file mode 100644 index 000000000..7cf4063fb --- /dev/null +++ b/patches/openocd-0.10.0-870-gaf952850b549/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-bitbang-Fix-FTBFS-with-GCC-10.patch +# 6c4519ce4897f369a132d623b1992b38 - git-ptx-patches magic -- cgit v1.2.3