summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 12:00:44 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 12:00:44 +0200
commit87b5717ff3e196e510e75e84f207cee54a4a2cc4 (patch)
tree6bca4621661bc0f624ea0d7fd0647745b935b328
parent6f063b7eca51f1f3c9fb19e2207e3797f3f1bd5d (diff)
downloadptxdist-87b5717ff3e196e510e75e84f207cee54a4a2cc4.tar.gz
openocd: add upstream patch to build with gcc 10
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/openocd-0.10.0-870-gaf952850b549/0001-bitbang-Fix-FTBFS-with-GCC-10.patch30
-rw-r--r--patches/openocd-0.10.0-870-gaf952850b549/series4
2 files changed, 34 insertions, 0 deletions
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 0000000..dbfa93e
--- /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 <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 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 0000000..7cf4063
--- /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