summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.34.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch61
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc
index 66a3850ef2..f65fdb7328 100644
--- a/meta/recipes-devtools/binutils/binutils-2.34.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.34.inc
@@ -41,6 +41,7 @@ SRC_URI = "\
41 file://0014-Detect-64-bit-MIPS-targets.patch \ 41 file://0014-Detect-64-bit-MIPS-targets.patch \
42 file://0015-sync-with-OE-libtool-changes.patch \ 42 file://0015-sync-with-OE-libtool-changes.patch \
43 file://0016-Check-for-clang-before-checking-gcc-version.patch \ 43 file://0016-Check-for-clang-before-checking-gcc-version.patch \
44 file://0017-binutils-drop-redundant-program_name-definition-fno-.patch \
44 file://CVE-2020-0551.patch \ 45 file://CVE-2020-0551.patch \
45" 46"
46S = "${WORKDIR}/git" 47S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch b/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch
new file mode 100644
index 0000000000..55af9abc13
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0017-binutils-drop-redundant-program_name-definition-fno-.patch
@@ -0,0 +1,61 @@
1From 57a3e055605b28a9449b1b27eda7125737c42b00 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <siarheit@google.com>
3Date: Sat, 1 Feb 2020 23:16:11 +0000
4Subject: [PATCH] binutils: drop redundant 'program_name' definition
5 (-fno-common)
6
7 * coffdump.c (program_name): Drop redundant definition.
8 * srconv.c (program_name): Likewise
9 * sysdump.c (program_name): Likewise
10
11Upstream-Status: Accepted (commit 0b398d69ac)
12Signed-off-by: Sergei Trofimovich <siarheit@google.com>
13Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
14---
15 binutils/coffdump.c | 2 --
16 binutils/srconv.c | 2 --
17 binutils/sysdump.c | 2 --
18 3 files changed, 6 deletions(-)
19
20diff --git a/binutils/coffdump.c b/binutils/coffdump.c
21index 531a4e46c3..336da57ca2 100644
22--- a/binutils/coffdump.c
23+++ b/binutils/coffdump.c
24@@ -456,8 +456,6 @@ coff_dump (struct coff_ofile *ptr)
25 dump_coff_section (ptr->sections + i);
26 }
27
28-char * program_name;
29-
30 static void
31 show_usage (FILE *file, int status)
32 {
33diff --git a/binutils/srconv.c b/binutils/srconv.c
34index 5742b16759..f071794f0a 100644
35--- a/binutils/srconv.c
36+++ b/binutils/srconv.c
37@@ -1687,8 +1687,6 @@ prescan (struct coff_ofile *otree)
38 }
39 }
40
41-char *program_name;
42-
43 ATTRIBUTE_NORETURN static void
44 show_usage (FILE *ffile, int status)
45 {
46diff --git a/binutils/sysdump.c b/binutils/sysdump.c
47index d433e71ed9..7eebbd61d3 100644
48--- a/binutils/sysdump.c
49+++ b/binutils/sysdump.c
50@@ -633,8 +633,6 @@ module (void)
51 }
52 }
53
54-char *program_name;
55-
56 ATTRIBUTE_NORETURN static void
57 show_usage (FILE *ffile, int status)
58 {
59--
602.26.2
61