1 files changed, 2 insertions, 23 deletions

diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
index 38225d171e..902a90dbc3 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
@@ -16,28 +16,9 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
  bfd/elflink.c | 20 ++++++++++++++------
  2 files changed, 21 insertions(+), 6 deletions(-)
 
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index da423b1..1f3fc1c 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,5 +1,12 @@
- 2018-10-23  Alan Modra  <amodra@gmail.com>
- 
-+       PR 23805
-+       * elflink.c (elf_link_input_bfd): Don't segfault on finding
-+       STT_TLS symbols without any TLS sections.  Instead, change the
-+       symbol type to STT_NOTYPE.
-+
-+2018-10-23  Alan Modra  <amodra@gmail.com>
-+
-        PR 23806
-        * merge.c (_bfd_add_merge_section): Don't attempt to merge
-        sections with ridiculously large alignments.
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index c3876cb..87440db 100644
 --- a/bfd/elflink.c
 +++ b/bfd/elflink.c
-@@ -10489,8 +10489,11 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
+@@ -10496,8 +10496,11 @@ elf_link_input_bfd (struct elf_final_lin
           if (ELF_ST_TYPE (osym.st_info) == STT_TLS)
             {
               /* STT_TLS symbols are relative to PT_TLS segment base.  */
@@ -51,7 +32,7 @@ index c3876cb..87440db 100644
             }
         }
  
-@@ -11046,12 +11049,17 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
+@@ -11053,12 +11056,17 @@ elf_link_input_bfd (struct elf_final_lin
                               sym.st_value += osec->vma;
                               if (ELF_ST_TYPE (sym.st_info) == STT_TLS)
                                 {
@@ -73,5 +54,3 @@ index c3876cb..87440db 100644
                                 }
                             }
  
--- 
-2.9.3