summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-08-02 09:52:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-08-02 10:03:09 +0200
commit7c796f45dc00009d11ff34de822931e1e51bd79f (patch)
treec4fcad346ce4a548fd24caf1a4f23be11f175b70
parent18506970199f8b16915c802d38d75918cb0e0f68 (diff)
downloadptxdist-7c796f45dc00009d11ff34de822931e1e51bd79f.tar.gz
ptxdist-7c796f45dc00009d11ff34de822931e1e51bd79f.tar.xz
elfutils: reimport latest debian patches
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/elfutils-0.180/0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch6
-rw-r--r--patches/elfutils-0.180/0002-riscv-retval-workaround.patch24
-rw-r--r--patches/elfutils-0.180/series4
3 files changed, 28 insertions, 6 deletions
diff --git a/patches/elfutils-0.180/0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch b/patches/elfutils-0.180/0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch
index 15ec6a6d8..18820595a 100644
--- a/patches/elfutils-0.180/0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch
+++ b/patches/elfutils-0.180/0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch
@@ -1,10 +1,10 @@
From: Helmut Grohne <helmut@subdivi.de>
-Date: Thu, 30 Jul 2020 20:37:12 +0200
+Date: Sun, 2 Aug 2020 09:48:45 +0200
Subject: [PATCH] disable -Werror as it tends to break with new gcc versions
-Patch imported from debian 0.180-1.
+Imported from elfutils_0.180-1.debian.tar.xz
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
config/eu.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/patches/elfutils-0.180/0002-riscv-retval-workaround.patch b/patches/elfutils-0.180/0002-riscv-retval-workaround.patch
new file mode 100644
index 000000000..338b533d6
--- /dev/null
+++ b/patches/elfutils-0.180/0002-riscv-retval-workaround.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 2 Aug 2020 09:48:45 +0200
+Subject: [PATCH] riscv-retval-workaround
+
+Imported from elfutils_0.180-1.debian.tar.xz
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ backends/riscv_retval.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backends/riscv_retval.c b/backends/riscv_retval.c
+index 35b6010bf3e3..46d465e913d4 100644
+--- a/backends/riscv_retval.c
++++ b/backends/riscv_retval.c
+@@ -111,7 +111,7 @@ flatten_aggregate_arg (Dwarf_Die *typedie __attribute__ ((unused)),
+ Dwarf_Die *arg1 __attribute__ ((unused)))
+ {
+ /* ??? */
+- return 1;
++ return 0;
+ }
+
+ static int
diff --git a/patches/elfutils-0.180/series b/patches/elfutils-0.180/series
index 6e83826e3..0ecd40a09 100644
--- a/patches/elfutils-0.180/series
+++ b/patches/elfutils-0.180/series
@@ -1,4 +1,2 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
0001-disable-Werror-as-it-tends-to-break-with-new-gcc-ver.patch
-# 881dc427356ca2d007dd3d3f576ea5a8 - git-ptx-patches magic
+0002-riscv-retval-workaround.patch