1 files changed, 6 insertions, 11 deletions

diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
index a6ce0b9a8a..ce5b9f392d 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-17450.patch
@@ -20,12 +20,10 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
  bfd/dwarf2.c | 35 +++++++++++++++++------------------
  1 file changed, 17 insertions(+), 18 deletions(-)
 
-diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
-index 0b4e485582..20ec9e2e56 100644
 --- a/bfd/dwarf2.c
 +++ b/bfd/dwarf2.c
-@@ -2803,13 +2803,13 @@ lookup_symbol_in_variable_table (struct comp_unit *unit,
- }
+@@ -2812,13 +2812,13 @@ static bfd_boolean comp_unit_maybe_decod
+                                                     struct dwarf2_debug *);
  
  static bfd_boolean
 -find_abstract_instance (struct comp_unit *   unit,
@@ -45,7 +43,7 @@ index 0b4e485582..20ec9e2e56 100644
  {
    bfd *abfd = unit->abfd;
    bfd_byte *info_ptr;
-@@ -2820,6 +2820,14 @@ find_abstract_instance (struct comp_unit *   unit,
+@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit
    struct attribute attr;
    const char *name = NULL;
  
@@ -60,7 +58,7 @@ index 0b4e485582..20ec9e2e56 100644
    /* DW_FORM_ref_addr can reference an entry in a different CU. It
       is an offset from the .debug_info section, not the current CU.  */
    if (attr_ptr->form == DW_FORM_ref_addr)
-@@ -2939,15 +2947,6 @@ find_abstract_instance (struct comp_unit *   unit,
+@@ -2962,15 +2970,6 @@ find_abstract_instance (struct comp_unit
                                          info_ptr, info_ptr_end);
               if (info_ptr == NULL)
                 break;
@@ -76,7 +74,7 @@ index 0b4e485582..20ec9e2e56 100644
               switch (attr.name)
                 {
                 case DW_AT_name:
-@@ -2961,7 +2960,7 @@ find_abstract_instance (struct comp_unit *   unit,
+@@ -2984,7 +2983,7 @@ find_abstract_instance (struct comp_unit
                     }
                   break;
                 case DW_AT_specification:
@@ -85,7 +83,7 @@ index 0b4e485582..20ec9e2e56 100644
                                                &name, is_linkage,
                                                filename_ptr, linenumber_ptr))
                     return FALSE;
-@@ -3175,7 +3174,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
+@@ -3200,7 +3199,7 @@ scan_unit_for_symbols (struct comp_unit
  
                 case DW_AT_abstract_origin:
                 case DW_AT_specification:
@@ -94,6 +92,3 @@ index 0b4e485582..20ec9e2e56 100644
                                                &func->name,
                                                &func->is_linkage,
                                                &func->file,
--- 
-2.23.0
-