From cf872ba730f96c47b9c36532b0a3a59cae98d0aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 8 Dec 2019 00:37:59 -0800 Subject: binutils: Upgrade to 2.33.1 Drop CVE patches which are already available on binutils-2_33-branch Forward port rest of the patches (From OE-Core rev: 7bcfce05045fb7e10456aa1f5301e70c178f20d7) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...es-of-system-directories-when-cross-linki.patch | 60 +++++++--------------- 1 file changed, 19 insertions(+), 41 deletions(-) (limited to 'meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch') diff --git a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch index 9727821b1f..655cc375a9 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -1,7 +1,7 @@ -From 98f68c0892ba4bbd53b0a0a4cbbdf0b7197e0320 Mon Sep 17 00:00:00 2001 +From 8ee1a4986ea35bd1e8ab867c5639d5fdbd944d9f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Jan 2016 06:31:09 +0000 -Subject: [PATCH 08/15] warn for uses of system directories when cross linking +Subject: [PATCH] warn for uses of system directories when cross linking 2008-07-02 Joseph Myers @@ -62,8 +62,6 @@ Signed-off-by: Khem Raj ld/lexsup.c | 16 ++++++++++++++++ 9 files changed, 86 insertions(+) -diff --git a/ld/config.in b/ld/config.in -index d93c9b0830..5da2742bea 100644 --- a/ld/config.in +++ b/ld/config.in @@ -31,6 +31,9 @@ @@ -76,11 +74,9 @@ index d93c9b0830..5da2742bea 100644 /* Additional extension a shared object might have. */ #undef EXTRA_SHLIB_EXTENSION -diff --git a/ld/configure b/ld/configure -index 43c391c2b3..ff9f6b3c02 100755 --- a/ld/configure +++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path +@@ -827,6 +827,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -88,7 +84,7 @@ index 43c391c2b3..ff9f6b3c02 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1490,6 +1491,8 @@ Optional Features: +@@ -1491,6 +1492,8 @@ Optional Features: --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -97,7 +93,7 @@ index 43c391c2b3..ff9f6b3c02 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -16618,6 +16621,19 @@ fi +@@ -16619,6 +16622,19 @@ fi @@ -117,8 +113,6 @@ index 43c391c2b3..ff9f6b3c02 100755 # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; case "${enableval}" in -diff --git a/ld/configure.ac b/ld/configure.ac -index d335f21091..7f692d9387 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) @@ -138,8 +132,6 @@ index d335f21091..7f692d9387 100644 dnl Use --enable-gold to decide if this linker should be the default. dnl "install_as_default" is set to false if gold is the default linker. dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index b97d977f37..f3bbd2d55d 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -180,6 +180,14 @@ typedef struct @@ -157,11 +149,9 @@ index b97d977f37..f3bbd2d55d 100644 /* Big or little endian as set on command line. */ enum endian_enum endian; -diff --git a/ld/ld.texi b/ld/ld.texi -index 5179af3e0e..f78bf74682 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2524,6 +2524,18 @@ string identifying the original linked file does not change. +@@ -2557,6 +2557,18 @@ string identifying the original linked f Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -180,11 +170,9 @@ index 5179af3e0e..f78bf74682 100644 @end table @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index fcadc08c73..63e295ce8a 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -208,24 +196,20 @@ index fcadc08c73..63e295ce8a 100644 } /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 32853debe4..8135361c49 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -148,6 +148,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, +@@ -150,6 +150,8 @@ enum option_values OPTION_FORCE_GROUP_ALLOCATION, + OPTION_PRINT_MAP_DISCARDED, + OPTION_NO_PRINT_MAP_DISCARDED, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 77cdbd0dd2..725512f126 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -269,6 +269,8 @@ main (int argc, char **argv) +@@ -270,6 +270,8 @@ main (int argc, char **argv) command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -234,13 +218,11 @@ index 77cdbd0dd2..725512f126 100644 /* We initialize DEMANGLING based on the environment variable COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 88e85c73f4..eed1b71456 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), +@@ -549,6 +549,14 @@ static const struct ld_option ld_options + { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, + '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, @@ -253,10 +235,10 @@ index 88e85c73f4..eed1b71456 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1577,6 +1585,14 @@ parse_args (unsigned argc, char **argv) - einfo (_("%F%P: invalid argument to option" - " \"--orphan-handling\"\n")); - break; +@@ -1590,6 +1598,13 @@ parse_args (unsigned argc, char **argv) + + case OPTION_PRINT_MAP_DISCARDED: + config.print_map_discarded = TRUE; + + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: + command_line.poison_system_directories = FALSE; @@ -264,10 +246,6 @@ index 88e85c73f4..eed1b71456 100644 + + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: + command_line.error_poison_system_directories = TRUE; -+ break; + break; } } - --- -2.20.1 - -- cgit v1.2.3-54-g00ecf