diff --git a/binutils-2.35-branch.diff.gz b/binutils-2.35-branch.diff.gz
deleted file mode 100644
index e8620bc..0000000
--- a/binutils-2.35-branch.diff.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83c03c0d081b9183c4928728fe2d52f242271c81d0e9f30d1ad23786ea27d253
-size 91174
diff --git a/binutils-2.35.1.tar.bz2 b/binutils-2.35.1.tar.bz2
deleted file mode 100644
index ca84470..0000000
--- a/binutils-2.35.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:320e7a1d0f46fcd9f413f1046e216cbe23bb2bce6deb6c6a63304425e48b1942
-size 32892584
diff --git a/binutils-2.35.1.tar.bz2.sig b/binutils-2.35.1.tar.bz2.sig
deleted file mode 100644
index 7bdc777..0000000
--- a/binutils-2.35.1.tar.bz2.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEOiS8Ho+0CfqfFDcYE/zvid2ePE8FAl9l4ecACgkQE/zvid2e
-PE9fzxAAtvtjxNFBOH/h7B4T3G4emzdNeO3KAl0swPNpeL77FfXjQwLe2FQ02lcK
-IIgzsatPIG0/ov9xuLnfPSHExKtUpM1rmY4qNs9qwBU52AOsAoyfi4wWSuQOPPn/
-5PXfk7hCoJNnSDVEd0IT8gDNEVvnjKvjF/NMcyqA9WAxX08Jo5GA5HOHmzyzQKXX
-SW4rJJ4JmH1Wdz2MY9TedBxSzWmgkVe/HNk5ngtkaMpV79tC0YLdDUXKxZYmgra0
-zLDs6/A64bXYrIuFaC2I+ivcDB6lVkbicUf1uuHjYc0cen0o2FT9qz8qQxFJfg2h
-bva3pAKRuFg7oy2lpRa6z8ioXBD8rOuSO9Ffvp4U/wZwOC+Kv+GyRe0VQXEH/EOX
-nYo2dWeZqHii2+4aM0gNeDJpgSDrSb5/67MAr+Cchwi6W4IN+zn6ETRvnIj+G1Yg
-TxHjLPzJ/46K5vmPrIcDr5mpioFoHkLOcGaeLgKfkBTco9faRBbcFwUTj1jDf6cd
-kOVrpmI4KCx6w613PyHzieb6KW9vQcyUmV5OveultrgLFSav8XDN06WyXAKqsvqB
-aMjheu/YO4U2fzq6+6fJVy8uO+kc1AKX3GzKJH5SzAZ1irNJsFqD++5vaZ7mpJ6g
-DERQZWFIwzXXt4ImLADujQE+/7aClBsENzxiDqg1dAEg2ijLyJA=
-=MLVz
------END PGP SIGNATURE-----
diff --git a/binutils-2.36-branch.diff.gz b/binutils-2.36-branch.diff.gz
new file mode 100644
index 0000000..5bf7a09
--- /dev/null
+++ b/binutils-2.36-branch.diff.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79dd26230d697a2e7e85cf1c7e717af567c1707527fac327cc41a8023a1bfb91
+size 6966
diff --git a/binutils-2.36.tar.bz2 b/binutils-2.36.tar.bz2
new file mode 100644
index 0000000..91a8356
--- /dev/null
+++ b/binutils-2.36.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:209ef690dc7ac28ca592daf7e87d6289222a61fb96104dd5d5e016133ed38e8d
+size 33688521
diff --git a/binutils-2.36.tar.bz2.sig b/binutils-2.36.tar.bz2.sig
new file mode 100644
index 0000000..ae6a009
--- /dev/null
+++ b/binutils-2.36.tar.bz2.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEOiS8Ho+0CfqfFDcYE/zvid2ePE8FAmANVqwACgkQE/zvid2e
+PE99sQ/+ILZXdxDA0n+8UO1tqPyL4dUzzG7laDE6GsGmYS+idh4LER4+xTXqhjC7
+WxFESk81QUcihLHfuZEkKDSuEQWPvPkMgc0Yg5hEC24im/qjSzTYjg53g+PRa/5y
+2LOGEH4KIgB0UVPIPiMknNUsUo/lpTAo7yHAE9OFARjC5gpByzXkJKSgcOHq1H6o
+eHiWAAdJOwxhb30KuPxisHmIhpsFQf9m/KjcdOzg5AUJqbRpwSQt0A/YrhTVkPLX
+Xehbp6C1dAjybJ0qUjsNihugSC/ZloxjgzN1TEbzgkl+NXax265L8rsSWors7L8o
+vE9alFmLwAtbAi93HZdzzoVLSEYhbJGgmzcbDMgGHXHgO1WEKKfh0vwHET+isaLU
+sIa77DD8/aHC+VQBBM/JpUzgEcF3jZzkrq+meJiC43fCWsZl9NdkcN6FtA/CDsj9
+sm5ab/PxINztFRdzavnw9P64d9FT2vcSSqB/Dam0ogV+Ie06vUfFCljoznAfhipz
+rzwrY11g23kKSHugaZTaeZIhT3RQbLJ4qRu2huwIUYi4oOmWm5SMQyHLkiW9iCeJ
+yo8g8wpouLNFdic1bcU4QV2Nko3Tr88ZYeNXe7umaMX6a2LvKEA56/EDNGJ8KX6v
+OfOXrk7lsmLizUXGhF0s1ZcZw1obXybEJFBq+F2Lj9Ht1ubQmgA=
+=eOF0
+-----END PGP SIGNATURE-----
diff --git a/binutils-fix-relax.diff b/binutils-fix-relax.diff
index 5d76520..b18580f 100644
--- a/binutils-fix-relax.diff
+++ b/binutils-fix-relax.diff
@@ -13,8 +13,8 @@ index 549a8be6a6..b89b0023db 100644
  
        if (opcode == 0x8b)
  	{
--	  if (abs_symbol && local_ref)
-+	  if (abs_symbol && local_ref && rex)
+-	  if (abs_symbol && local_ref && relocx)
++	  if (abs_symbol && local_ref && relocx && rex)
  	    to_reloc_pc32 = FALSE;
  
  	  if (to_reloc_pc32)
diff --git a/binutils-revert-nm-symversion.diff b/binutils-revert-nm-symversion.diff
index c0ba9d6..0070b6d 100644
--- a/binutils-revert-nm-symversion.diff
+++ b/binutils-revert-nm-symversion.diff
@@ -8,10 +8,10 @@ Index: binutils-2.35/binutils/nm.c
 ===================================================================
 --- binutils-2.35.orig/binutils/nm.c	2020-07-24 11:12:19.000000000 +0200
 +++ binutils-2.35/binutils/nm.c	2020-08-07 16:42:58.000000000 +0200
-@@ -411,7 +411,7 @@ print_symname (const char *form, struct
+@@ -418,7 +418,7 @@ print_symname (const char *form, struct extended_symbol_info *info,
+ 	name = alloc;
      }
  
-   printf (form, name);
 -  if (info != NULL && info->elfinfo)
 +  if (info != NULL && info->elfinfo && 0)
      {
diff --git a/binutils-revert-plt32-in-branches.diff b/binutils-revert-plt32-in-branches.diff
index 6cc1d38..506f592 100644
--- a/binutils-revert-plt32-in-branches.diff
+++ b/binutils-revert-plt32-in-branches.diff
@@ -79,11 +79,11 @@ Date:   Tue Feb 13 07:34:22 2018 -0800
     	* testsuite/ld-x86-64/pr22791-2c.s: Likewise.
     	* testsuite/ld-x86-64/x86-64.exp: Run PR ld/22791 tests.
 
-Index: binutils-2.35/bfd/elf64-x86-64.c
-===================================================================
---- binutils-2.35.orig/bfd/elf64-x86-64.c
-+++ binutils-2.35/bfd/elf64-x86-64.c
-@@ -1834,6 +1834,24 @@ elf_x86_64_convert_load_reloc (bfd *abfd
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index daae52b9537..5030cc6e121 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -1834,6 +1834,24 @@ elf_x86_64_convert_load_reloc (bfd *abfd,
    return TRUE;
  }
  
@@ -108,7 +108,7 @@ Index: binutils-2.35/bfd/elf64-x86-64.c
  /* Look through the relocs for a section during the first phase, and
     calculate needed space in the global offset table, procedure
     linkage table, and dynamic reloc sections.  */
-@@ -3143,28 +3161,30 @@ elf_x86_64_relocate_section (bfd *output
+@@ -3143,28 +3161,30 @@ elf_x86_64_relocate_section (bfd *output_bfd,
  			&& (eh == NULL
  			    || !UNDEFINED_WEAK_RESOLVED_TO_ZERO (info,
  								 eh)))
@@ -146,7 +146,7 @@ Index: binutils-2.35/bfd/elf64-x86-64.c
  		}
  	      else if (no_copyreloc_p || bfd_link_dll (info))
  		{
-@@ -3173,9 +3193,10 @@ elf_x86_64_relocate_section (bfd *output
+@@ -3173,9 +3193,10 @@ elf_x86_64_relocate_section (bfd *output_bfd,
  		     relocations against default and protected
  		     symbols since address of protected function
  		     and location of protected data may not be in
@@ -159,11 +159,11 @@ Index: binutils-2.35/bfd/elf64-x86-64.c
  		}
  
  	      if (fail)
-Index: binutils-2.35/gas/config/tc-i386.c
-===================================================================
---- binutils-2.35.orig/gas/config/tc-i386.c
-+++ binutils-2.35/gas/config/tc-i386.c
-@@ -8493,52 +8493,12 @@ output_branch (void)
+diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
+index 9a2dfc92281..885ee85b999 100644
+--- a/gas/config/tc-i386.c
++++ b/gas/config/tc-i386.c
+@@ -8605,52 +8605,12 @@ output_branch (void)
    frag_var (rs_machine_dependent, 5, i.reloc[0], subtype, sym, off, p);
  }
  
@@ -216,7 +216,7 @@ Index: binutils-2.35/gas/config/tc-i386.c
  
    if (i.tm.opcode_modifier.jump == JUMP_BYTE)
      {
-@@ -8606,17 +8566,8 @@ output_jump (void)
+@@ -8724,17 +8684,8 @@ output_jump (void)
        abort ();
      }
  
@@ -235,7 +235,7 @@ Index: binutils-2.35/gas/config/tc-i386.c
  
    /* All jumps handled here are signed, but don't use a signed limit
       check for 32 and 16 bit jumps as we want to allow wrap around at
-@@ -11921,10 +11872,6 @@ md_estimate_size_before_relax (fragS *fr
+@@ -12085,10 +12036,6 @@ md_estimate_size_before_relax (fragS *fragP, segT segment)
  	reloc_type = (enum bfd_reloc_code_real) fragP->fr_var;
        else if (size == 2)
  	reloc_type = BFD_RELOC_16_PCREL;
@@ -246,10 +246,10 @@ Index: binutils-2.35/gas/config/tc-i386.c
        else
  	reloc_type = BFD_RELOC_32_PCREL;
  
-Index: binutils-2.35/gas/testsuite/gas/i386/ilp32/reloc64.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/ilp32/reloc64.d
-+++ binutils-2.35/gas/testsuite/gas/i386/ilp32/reloc64.d
+diff --git a/gas/testsuite/gas/i386/ilp32/reloc64.d b/gas/testsuite/gas/i386/ilp32/reloc64.d
+index 78ca3fd9e38..a961679754a 100644
+--- a/gas/testsuite/gas/i386/ilp32/reloc64.d
++++ b/gas/testsuite/gas/i386/ilp32/reloc64.d
 @@ -17,7 +17,7 @@ Disassembly of section \.text:
  .*[ 	]+R_X86_64_PC8[ 	]+xtrn\+0x0*1
  .*[ 	]+R_X86_64_PC32[ 	]+xtrn-0x0*4
@@ -259,27 +259,27 @@ Index: binutils-2.35/gas/testsuite/gas/i386/ilp32/reloc64.d
  .*[ 	]+R_X86_64_PC8[ 	]+xtrn-0x0*1
  .*[ 	]+R_X86_64_GOT32[ 	]+xtrn
  .*[ 	]+R_X86_64_GOT32[ 	]+xtrn
-Index: binutils-2.35/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
-+++ binutils-2.35/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
+diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
+index acf8c42ca97..57845fdc208 100644
+--- a/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
++++ b/gas/testsuite/gas/i386/ilp32/x86-64-branch.d
 @@ -20,9 +20,9 @@ Disassembly of section .text:
- [ 	]*[a-f0-9]+:	66 ff 20             	data16 jmpq \*\(%rax\)
- [ 	]*[a-f0-9]+:	e8 00 00 00 00       	callq  0x1f	1b: R_X86_64_PC32	\*ABS\*\+0x10003c
- [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   0x24	20: R_X86_64_PC32	\*ABS\*\+0x10003c
--[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 callq 0x2a	26: R_X86_64_PLT32	foo-0x4
--[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmpq 0x30	2c: R_X86_64_PLT32	foo-0x4
--[ 	]*[a-f0-9]+:	66 0f 82 00 00 00 00 	data16 jb 0x37	33: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 callq 0x2a	26: R_X86_64_PC32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmpq 0x30	2c: R_X86_64_PC32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 0f 82 00 00 00 00 	data16 jb 0x37	33: R_X86_64_PC32	foo-0x4
- [ 	]*[a-f0-9]+:	66 c3                	data16 retq *
- [ 	]*[a-f0-9]+:	66 c2 08 00          	data16 retq \$0x8
- [ 	]*[a-f0-9]+:	ff d0                	callq  \*%rax
-Index: binutils-2.35/gas/testsuite/gas/i386/reloc64.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/reloc64.d
-+++ binutils-2.35/gas/testsuite/gas/i386/reloc64.d
+ [ 	]*[a-f0-9]+:	66 ff 20             	data16 jmp \*\(%rax\)
+ [ 	]*[a-f0-9]+:	e8 00 00 00 00       	call   (0x)?1f <.*>	1b: R_X86_64_PC32	\*ABS\*\+0x10003c
+ [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    (0x)?24 <.*>	20: R_X86_64_PC32	\*ABS\*\+0x10003c
+-[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 call (0x)?2a <.*>	26: R_X86_64_PLT32	foo-0x4
+-[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmp (0x)?30 <.*>	2c: R_X86_64_PLT32	foo-0x4
+-[ 	]*[a-f0-9]+:	66 0f 82 00 00 00 00 	data16 jb (0x)?37 <.*>	33: R_X86_64_PLT32	foo-0x4
++[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 call (0x)?2a <.*>	26: R_X86_64_PC32	foo-0x4
++[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmp (0x)?30 <.*>	2c: R_X86_64_PC32	foo-0x4
++[ 	]*[a-f0-9]+:	66 0f 82 00 00 00 00 	data16 jb (0x)?37 <.*>	33: R_X86_64_PC32	foo-0x4
+ [ 	]*[a-f0-9]+:	66 c3                	data16 ret *
+ [ 	]*[a-f0-9]+:	66 c2 08 00          	data16 ret \$0x8
+ [ 	]*[a-f0-9]+:	3e 74 03[ 	]+je,pt  +[0-9a-fx]+ <.*>
+diff --git a/gas/testsuite/gas/i386/reloc64.d b/gas/testsuite/gas/i386/reloc64.d
+index 540a9b77d35..ea16c68de4b 100644
+--- a/gas/testsuite/gas/i386/reloc64.d
++++ b/gas/testsuite/gas/i386/reloc64.d
 @@ -20,7 +20,7 @@ Disassembly of section \.text:
  .*[ 	]+R_X86_64_PC8[ 	]+xtrn\+0x0*1
  .*[ 	]+R_X86_64_PC32[ 	]+xtrn-0x0*4
@@ -289,147 +289,169 @@ Index: binutils-2.35/gas/testsuite/gas/i386/reloc64.d
  .*[ 	]+R_X86_64_PC8[ 	]+xtrn-0x0*1
  .*[ 	]+R_X86_64_GOT64[ 	]+xtrn
  .*[ 	]+R_X86_64_GOT32[ 	]+xtrn
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-jump.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-jump.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-jump.d
+diff --git a/gas/testsuite/gas/i386/x86-64-branch-2.d b/gas/testsuite/gas/i386/x86-64-branch-2.d
+index fab75a6394c..e025de90b68 100644
+--- a/gas/testsuite/gas/i386/x86-64-branch-2.d
++++ b/gas/testsuite/gas/i386/x86-64-branch-2.d
+@@ -9,12 +9,12 @@ Disassembly of section .text:
+ 
+ 0+ <bar-0xb>:
+ [ 	]*[a-f0-9]+:	66 e9 00 00          	jmpw   4 <bar-0x7>	2: R_X86_64_PC16	foo-0x2
+-[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 rex\.W jmp b <bar>	7: R_X86_64_PLT32	foo-0x4
++[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 rex\.W jmp b <bar>	7: R_X86_64_PC32	foo-0x4
+ 
+ 0+b <bar>:
+ [ 	]*[a-f0-9]+:	89 c3                	mov    %eax,%ebx
+ [ 	]*[a-f0-9]+:	66 e8 00 00          	callw  11 <bar\+0x6>	f: R_X86_64_PC16	foo-0x2
+-[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 rex\.W call 18 <bar\+0xd>	14: R_X86_64_PLT32	foo-0x4
++[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 rex\.W call 18 <bar\+0xd>	14: R_X86_64_PC32	foo-0x4
+ [ 	]*[a-f0-9]+:	66 c3                	retw *
+ [ 	]*[a-f0-9]+:	66 c2 08 00          	retw   \$0x8
+ #pass
+diff --git a/gas/testsuite/gas/i386/x86-64-jump.d b/gas/testsuite/gas/i386/x86-64-jump.d
+index 7d2c994ce26..58ad424badb 100644
+--- a/gas/testsuite/gas/i386/x86-64-jump.d
++++ b/gas/testsuite/gas/i386/x86-64-jump.d
 @@ -9,7 +9,7 @@ Disassembly of section .text:
  
  0+ <.text>:
  [ 	]*[a-f0-9]+:	eb fe                	jmp    (0x0|0 <.text>)
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   0x7	3: R_X86_64_PLT32	xxx-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   0x7	3: R_X86_64_PC32	xxx-0x4
- [ 	]*[a-f0-9]+:	ff 24 25 00 00 00 00 	jmpq   \*0x0	a: R_X86_64_32S	xxx
- [ 	]*[a-f0-9]+:	ff e7                	jmpq   \*%rdi
- [ 	]*[a-f0-9]+:	ff 27                	jmpq   \*\(%rdi\)
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    0x7	3: R_X86_64_PLT32	xxx-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    0x7	3: R_X86_64_PC32	xxx-0x4
+ [ 	]*[a-f0-9]+:	ff 24 25 00 00 00 00 	jmp    \*0x0	a: R_X86_64_32S	xxx
+ [ 	]*[a-f0-9]+:	ff e7                	jmp    \*%rdi
+ [ 	]*[a-f0-9]+:	ff 27                	jmp    \*\(%rdi\)
 @@ -18,7 +18,7 @@ Disassembly of section .text:
  [ 	]*[a-f0-9]+:	ff 2c 25 00 00 00 00 	ljmp   \*0x0	24: R_X86_64_32S	xxx
  [ 	]*[a-f0-9]+:	66 ff 2c 25 00 00 00 00 	ljmpw  \*0x0	2c: R_X86_64_32S	xxx
- [ 	]*[a-f0-9]+:	e8 cb ff ff ff       	callq  0x0
--[ 	]*[a-f0-9]+:	e8 00 00 00 00       	callq  0x3a	36: R_X86_64_PLT32	xxx-0x4
-+[ 	]*[a-f0-9]+:	e8 00 00 00 00       	callq  0x3a	36: R_X86_64_PC32	xxx-0x4
- [ 	]*[a-f0-9]+:	ff 14 25 00 00 00 00 	callq  \*0x0	3d: R_X86_64_32S	xxx
- [ 	]*[a-f0-9]+:	ff d7                	callq  \*%rdi
- [ 	]*[a-f0-9]+:	ff 17                	callq  \*\(%rdi\)
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
+ [ 	]*[a-f0-9]+:	e8 cb ff ff ff       	call   0x0
+-[ 	]*[a-f0-9]+:	e8 00 00 00 00       	call   0x3a	36: R_X86_64_PLT32	xxx-0x4
++[ 	]*[a-f0-9]+:	e8 00 00 00 00       	call   0x3a	36: R_X86_64_PC32	xxx-0x4
+ [ 	]*[a-f0-9]+:	ff 14 25 00 00 00 00 	call   \*0x0	3d: R_X86_64_32S	xxx
+ [ 	]*[a-f0-9]+:	ff d7                	call   \*%rdi
+ [ 	]*[a-f0-9]+:	ff 17                	call   \*\(%rdi\)
+diff --git a/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d b/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
+index 795f3fdacc4..1d692e8f04d 100644
+--- a/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
++++ b/gas/testsuite/gas/i386/x86-64-mpx-branch-1.d
 @@ -23,9 +23,9 @@ Disassembly of section .text:
- [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 34 <foo2>
+ [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd call 34 <foo2>
  
  0+34 <foo2>:
--[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3a <foo2\+0x6>	36: R_X86_64_PLT32	foo-0x4
+-[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmp 3a <foo2\+0x6>	36: R_X86_64_PLT32	foo-0x4
 -[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 41 <foo2\+0xd>	3d: R_X86_64_PLT32	foo-0x4
--[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 47 <foo2\+0x13>	43: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 3a <foo2\+0x6>	36: R_X86_64_PC32	foo-0x4
+-[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd call 47 <foo2\+0x13>	43: R_X86_64_PLT32	foo-0x4
++[ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmp 3a <foo2\+0x6>	36: R_X86_64_PC32	foo-0x4
 +[ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 41 <foo2\+0xd>	3d: R_X86_64_PC32	foo-0x4
-+[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 47 <foo2\+0x13>	43: R_X86_64_PC32	foo-0x4
- [ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmpq 4d <foo2\+0x19>	49: R_X86_64_PLT32	foo-0x4
++[ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd call 47 <foo2\+0x13>	43: R_X86_64_PC32	foo-0x4
+ [ 	]*[a-f0-9]+:	f2 e9 00 00 00 00    	bnd jmp 4d <foo2\+0x19>	49: R_X86_64_PLT32	foo-0x4
  [ 	]*[a-f0-9]+:	f2 0f 82 00 00 00 00 	bnd jb 54 <foo2\+0x20>	50: R_X86_64_PLT32	foo-0x4
- [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd callq 5a <foo2\+0x26>	56: R_X86_64_PLT32	foo-0x4
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-3.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-nop-3.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-3.d
+ [ 	]*[a-f0-9]+:	f2 e8 00 00 00 00    	bnd call 5a <foo2\+0x26>	56: R_X86_64_PLT32	foo-0x4
+diff --git a/gas/testsuite/gas/i386/x86-64-nop-3.d b/gas/testsuite/gas/i386/x86-64-nop-3.d
+index 1975481cc59..436487b5a99 100644
+--- a/gas/testsuite/gas/i386/x86-64-nop-3.d
++++ b/gas/testsuite/gas/i386/x86-64-nop-3.d
 @@ -18,5 +18,5 @@ Disassembly of section .text:
  Disassembly of section .altinstr_replacement:
  
  0+ <.altinstr_replacement>:
-- +[a-f0-9]+:	e9 00 00 00 00       	jmpq   5 <_start\+0x5>	1: R_X86_64_PLT32	foo-0x4
-+ +[a-f0-9]+:	e9 00 00 00 00       	jmpq   5 <_start\+0x5>	1: R_X86_64_PC32	foo-0x4
+- +[a-f0-9]+:	e9 00 00 00 00       	jmp    5 <_start\+0x5>	1: R_X86_64_PLT32	foo-0x4
++ +[a-f0-9]+:	e9 00 00 00 00       	jmp    5 <_start\+0x5>	1: R_X86_64_PC32	foo-0x4
  #pass
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-4.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-nop-4.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-4.d
-@@ -21,5 +21,5 @@ Disassembly of section .altinstr_replace
+diff --git a/gas/testsuite/gas/i386/x86-64-nop-4.d b/gas/testsuite/gas/i386/x86-64-nop-4.d
+index 2da858db994..e390628b335 100644
+--- a/gas/testsuite/gas/i386/x86-64-nop-4.d
++++ b/gas/testsuite/gas/i386/x86-64-nop-4.d
+@@ -21,5 +21,5 @@ Disassembly of section .altinstr_replacement:
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
-- +[a-f0-9]+:	e9 00 00 00 00       	jmpq   b <_start\+0xb>	7: R_X86_64_PLT32	foo-0x4
-+ +[a-f0-9]+:	e9 00 00 00 00       	jmpq   b <_start\+0xb>	7: R_X86_64_PC32	foo-0x4
+- +[a-f0-9]+:	e9 00 00 00 00       	jmp    b <_start\+0xb>	7: R_X86_64_PLT32	foo-0x4
++ +[a-f0-9]+:	e9 00 00 00 00       	jmp    b <_start\+0xb>	7: R_X86_64_PC32	foo-0x4
  #pass
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-5.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-nop-5.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-nop-5.d
-@@ -24,5 +24,5 @@ Disassembly of section .altinstr_replace
+diff --git a/gas/testsuite/gas/i386/x86-64-nop-5.d b/gas/testsuite/gas/i386/x86-64-nop-5.d
+index d5c84c1edf8..69820d54de8 100644
+--- a/gas/testsuite/gas/i386/x86-64-nop-5.d
++++ b/gas/testsuite/gas/i386/x86-64-nop-5.d
+@@ -24,5 +24,5 @@ Disassembly of section .altinstr_replacement:
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
   +[a-f0-9]+:	89 c0                	mov    %eax,%eax
-- +[a-f0-9]+:	e9 00 00 00 00       	jmpq   d <_start\+0xd>	9: R_X86_64_PLT32	foo-0x4
-+ +[a-f0-9]+:	e9 00 00 00 00       	jmpq   d <_start\+0xd>	9: R_X86_64_PC32	foo-0x4
+- +[a-f0-9]+:	e9 00 00 00 00       	jmp    d <_start\+0xd>	9: R_X86_64_PLT32	foo-0x4
++ +[a-f0-9]+:	e9 00 00 00 00       	jmp    d <_start\+0xd>	9: R_X86_64_PC32	foo-0x4
  #pass
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-relax-2.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-relax-2.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-relax-2.d
+diff --git a/gas/testsuite/gas/i386/x86-64-relax-2.d b/gas/testsuite/gas/i386/x86-64-relax-2.d
+index fba47c14850..0949ab23907 100644
+--- a/gas/testsuite/gas/i386/x86-64-relax-2.d
++++ b/gas/testsuite/gas/i386/x86-64-relax-2.d
 @@ -11,12 +11,12 @@ Disassembly of section .text:
  0+ <foo>:
  [ 	]*[a-f0-9]+:	eb 24                	jmp    26 <local>
  [ 	]*[a-f0-9]+:	eb 1e                	jmp    22 <hidden_def>
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   9 <foo\+0x9>	5: R_X86_64_PLT32	global_def-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   9 <foo\+0x9>	5: R_X86_64_PC32	global_def-0x4
- [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   e <foo\+0xe>	a: R_X86_64_PLT32	global_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   13 <foo\+0x13>	f: R_X86_64_PLT32	weak_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   18 <foo\+0x18>	14: R_X86_64_PLT32	weak_hidden_undef-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1d <foo\+0x1d>	19: R_X86_64_PLT32	weak_hidden_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   22 <hidden_def>	1e: R_X86_64_PLT32	hidden_undef-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   13 <foo\+0x13>	f: R_X86_64_PC32	weak_def-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   18 <foo\+0x18>	14: R_X86_64_PC32	weak_hidden_undef-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1d <foo\+0x1d>	19: R_X86_64_PC32	weak_hidden_def-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   22 <hidden_def>	1e: R_X86_64_PC32	hidden_undef-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    9 <foo\+0x9>	5: R_X86_64_PLT32	global_def-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    9 <foo\+0x9>	5: R_X86_64_PC32	global_def-0x4
+ [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    e <foo\+0xe>	a: R_X86_64_PLT32	global_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    13 <foo\+0x13>	f: R_X86_64_PLT32	weak_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    18 <foo\+0x18>	14: R_X86_64_PLT32	weak_hidden_undef-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1d <foo\+0x1d>	19: R_X86_64_PLT32	weak_hidden_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    22 <hidden_def>	1e: R_X86_64_PLT32	hidden_undef-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    13 <foo\+0x13>	f: R_X86_64_PC32	weak_def-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    18 <foo\+0x18>	14: R_X86_64_PC32	weak_hidden_undef-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1d <foo\+0x1d>	19: R_X86_64_PC32	weak_hidden_def-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    22 <hidden_def>	1e: R_X86_64_PC32	hidden_undef-0x4
  
  0+22 <hidden_def>:
- [ 	]*[a-f0-9]+:	c3                   	retq   
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-relax-3.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-relax-3.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-relax-3.d
+ [ 	]*[a-f0-9]+:	c3                   	ret *
+diff --git a/gas/testsuite/gas/i386/x86-64-relax-3.d b/gas/testsuite/gas/i386/x86-64-relax-3.d
+index 01df9ef340e..d16e6a55395 100644
+--- a/gas/testsuite/gas/i386/x86-64-relax-3.d
++++ b/gas/testsuite/gas/i386/x86-64-relax-3.d
 @@ -12,10 +12,10 @@ Disassembly of section .text:
  [ 	]*[a-f0-9]+:	eb 1b                	jmp    1f <hidden_def>
  [ 	]*[a-f0-9]+:	eb 1b                	jmp    21 <global_def>
- [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   b <foo\+0xb>	7: R_X86_64_PLT32	global_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   10 <foo\+0x10>	c: R_X86_64_PLT32	weak_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   15 <foo\+0x15>	11: R_X86_64_PLT32	weak_hidden_undef-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1a <foo\+0x1a>	16: R_X86_64_PLT32	weak_hidden_def-0x4
--[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1f <hidden_def>	1b: R_X86_64_PLT32	hidden_undef-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   10 <foo\+0x10>	c: R_X86_64_PC32	weak_def-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   15 <foo\+0x15>	11: R_X86_64_PC32	weak_hidden_undef-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1a <foo\+0x1a>	16: R_X86_64_PC32	weak_hidden_def-0x4
-+[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   1f <hidden_def>	1b: R_X86_64_PC32	hidden_undef-0x4
+ [ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    b <foo\+0xb>	7: R_X86_64_PLT32	global_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    10 <foo\+0x10>	c: R_X86_64_PLT32	weak_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    15 <foo\+0x15>	11: R_X86_64_PLT32	weak_hidden_undef-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1a <foo\+0x1a>	16: R_X86_64_PLT32	weak_hidden_def-0x4
+-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1f <hidden_def>	1b: R_X86_64_PLT32	hidden_undef-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    10 <foo\+0x10>	c: R_X86_64_PC32	weak_def-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    15 <foo\+0x15>	11: R_X86_64_PC32	weak_hidden_undef-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1a <foo\+0x1a>	16: R_X86_64_PC32	weak_hidden_def-0x4
++[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    1f <hidden_def>	1b: R_X86_64_PC32	hidden_undef-0x4
  
  0+1f <hidden_def>:
- [ 	]*[a-f0-9]+:	c3                   	retq   
-Index: binutils-2.35/ld/testsuite/ld-x86-64/mpx1c.rd
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/mpx1c.rd
-+++ binutils-2.35/ld/testsuite/ld-x86-64/mpx1c.rd
+ [ 	]*[a-f0-9]+:	c3                   	ret *
+diff --git a/ld/testsuite/ld-x86-64/mpx1c.rd b/ld/testsuite/ld-x86-64/mpx1c.rd
+index d66524c8834..d3b292cbdc1 100644
+--- a/ld/testsuite/ld-x86-64/mpx1c.rd
++++ b/ld/testsuite/ld-x86-64/mpx1c.rd
 @@ -1,3 +1,3 @@
  #...
 -[0-9a-f ]+R_X86_64_PLT32 +0+ +.*
 +[0-9a-f ]+R_X86_64_PC32 +0+ +.*
  #...
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-1.err
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-1.err
+diff --git a/ld/testsuite/ld-x86-64/pr22791-1.err b/ld/testsuite/ld-x86-64/pr22791-1.err
+deleted file mode 100644
+index 8c5565992e7..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-1.err
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -.*relocation R_X86_64_PC32 against symbol `foo' can not be used when making a PIE object; recompile with -fPIE
 -#...
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-1a.c
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-1a.c
+diff --git a/ld/testsuite/ld-x86-64/pr22791-1a.c b/ld/testsuite/ld-x86-64/pr22791-1a.c
+deleted file mode 100644
+index cd0130cacdf..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-1a.c
 +++ /dev/null
 @@ -1,4 +0,0 @@
 -void
 -foo (void)
 -{
 -}
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-1b.s
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-1b.s
+diff --git a/ld/testsuite/ld-x86-64/pr22791-1b.s b/ld/testsuite/ld-x86-64/pr22791-1b.s
+deleted file mode 100644
+index 9751db49aa5..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-1b.s
 +++ /dev/null
 @@ -1,6 +0,0 @@
 -	.text
@@ -438,9 +460,10 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-1b.s
 -main:
 -	movl	foo(%rip), %eax
 -	.size	main, .-main
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2.rd
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-2.rd
+diff --git a/ld/testsuite/ld-x86-64/pr22791-2.rd b/ld/testsuite/ld-x86-64/pr22791-2.rd
+deleted file mode 100644
+index 70deb30d84d..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-2.rd
 +++ /dev/null
 @@ -1,6 +0,0 @@
 -#failif
@@ -449,9 +472,10 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2.rd
 -#...
 -[0-9a-f ]+R_X86_64_NONE.*
 -#...
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2a.s
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-2a.s
+diff --git a/ld/testsuite/ld-x86-64/pr22791-2a.s b/ld/testsuite/ld-x86-64/pr22791-2a.s
+deleted file mode 100644
+index 0a855024d74..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-2a.s
 +++ /dev/null
 @@ -1,8 +0,0 @@
 -	.text
@@ -462,9 +486,10 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2a.s
 -	jmp	bar
 -	.size	foo, .-foo
 -	.section	.note.GNU-stack,"",@progbits
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2b.c
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-2b.c
+diff --git a/ld/testsuite/ld-x86-64/pr22791-2b.c b/ld/testsuite/ld-x86-64/pr22791-2b.c
+deleted file mode 100644
+index 79ef27c0857..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-2b.c
 +++ /dev/null
 @@ -1,7 +0,0 @@
 -#include <stdio.h>
@@ -474,9 +499,10 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2b.c
 -{
 -  puts ("PASS");
 -}
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2c.s
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22791-2c.s
+diff --git a/ld/testsuite/ld-x86-64/pr22791-2c.s b/ld/testsuite/ld-x86-64/pr22791-2c.s
+deleted file mode 100644
+index 1460d1b8288..00000000000
+--- a/ld/testsuite/ld-x86-64/pr22791-2c.s
 +++ /dev/null
 @@ -1,12 +0,0 @@
 -	.text
@@ -491,10 +517,10 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22791-2c.s
 -	ret
 -	.size	main, .-main
 -	.section	.note.GNU-stack,"",@progbits
-Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22842b.S
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/pr22842b.S
-+++ binutils-2.35/ld/testsuite/ld-x86-64/pr22842b.S
+diff --git a/ld/testsuite/ld-x86-64/pr22842b.S b/ld/testsuite/ld-x86-64/pr22842b.S
+index f0659cd901e..b9dd81345b7 100644
+--- a/ld/testsuite/ld-x86-64/pr22842b.S
++++ b/ld/testsuite/ld-x86-64/pr22842b.S
 @@ -7,7 +7,7 @@ main:
          leaq    bar(%rip), %rdi
  	addq	%rax, %rdi
@@ -504,14 +530,15 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/pr22842b.S
  	xorl	%eax, %eax
  	popq	%rcx
  	retq
-Index: binutils-2.35/ld/testsuite/ld-x86-64/x86-64.exp
-===================================================================
---- binutils-2.35.orig/ld/testsuite/ld-x86-64/x86-64.exp
-+++ binutils-2.35/ld/testsuite/ld-x86-64/x86-64.exp
-@@ -1215,44 +1215,6 @@ if { [isnative] && [check_compiler_avail
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 83fdaa7db65..a3bb1e9ebd6 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -1250,44 +1250,6 @@ if { [isnative] && [check_compiler_available] } {
+ 	     {readelf -lW pr22393-3b.rd}} \
  	    "pr22393-3-static" \
  	] \
- 	[list \
+-	[list \
 -	    "Build pr22791-1.so" \
 -	    "-shared" \
 -	    "-fPIC -Wa,-mx86-used-note=yes" \
@@ -549,14 +576,14 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/x86-64.exp
 -	    {{readelf -drW pr22791-2.rd}} \
 -	    "pr22791-2" \
 -	] \
--	[list \
+ 	[list \
  	    "Build pr22842.so" \
  	    "-shared" \
- 	    "-fPIC -Wa,-mx86-used-note=yes" \
-@@ -1701,15 +1663,6 @@ if { [isnative] && [check_compiler_avail
+@@ -1752,15 +1714,6 @@ if { [isnative] && [check_compiler_available] } {
+ 	    "pr22393-3-static" \
  	    "pass.out" \
  	] \
- 	[list \
+-	[list \
 -	    "Run pr22791-2" \
 -	    "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \
 -	    "-Wa,-mx86-used-note=yes" \
@@ -565,51 +592,6 @@ Index: binutils-2.35/ld/testsuite/ld-x86-64/x86-64.exp
 -	    "pass.out" \
 -	    "$NOPIE_CFLAGS" \
 -	] \
--	[list \
+ 	[list \
  	    "Run pr22842" \
  	    "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
- 	    "-Wa,-mx86-used-note=yes" \
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-branch-2.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-branch-2.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-branch-2.d
-@@ -9,12 +9,12 @@ Disassembly of section .text:
- 
- 0+ <bar-0xb>:
- [ 	]*[a-f0-9]+:	66 e9 00 00          	jmpw   4 <bar-0x7>	2: R_X86_64_PC16	foo-0x2
--[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 jmpq b <bar>	7: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 jmpq b <bar>	7: R_X86_64_PC32	foo-0x4
- 
- 0+b <bar>:
- [ 	]*[a-f0-9]+:	89 c3                	mov    %eax,%ebx
- [ 	]*[a-f0-9]+:	66 e8 00 00          	callw  11 <bar\+0x6>	f: R_X86_64_PC16	foo-0x2
--[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 callq 18 <bar\+0xd>	14: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 callq 18 <bar\+0xd>	14: R_X86_64_PC32	foo-0x4
- [ 	]*[a-f0-9]+:	66 c3                	retw *
- [ 	]*[a-f0-9]+:	66 c2 08 00          	retw   \$0x8
- #pass
-Index: binutils-2.35/gas/testsuite/gas/i386/x86-64-branch-3.d
-===================================================================
---- binutils-2.35.orig/gas/testsuite/gas/i386/x86-64-branch-3.d
-+++ binutils-2.35/gas/testsuite/gas/i386/x86-64-branch-3.d
-@@ -8,15 +8,15 @@
- Disassembly of section .text:
- 
- 0+ <bar-0xd>:
--[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmpq 6 <bar-0x7>	2: R_X86_64_PLT32	foo-0x4
--[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 rex\.W jmpq d <bar>	9: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 e9 00 00 00 00    	data16 jmpq 6 <bar-0x7>	2: R_X86_64_PC32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 48 e9 00 00 00 00 	data16 rex\.W jmpq d <bar>	9: R_X86_64_PC32	foo-0x4
- 
- 0+d <bar>:
- [ 	]*[a-f0-9]+:	89 c3                	mov    %eax,%ebx
--[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 callq 15 <bar\+0x8>	11: R_X86_64_PLT32	foo-0x4
--[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 rex\.W callq 1c <bar\+0xf>	18: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 e8 00 00 00 00    	data16 callq 15 <bar\+0x8>	11: R_X86_64_PC32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 48 e8 00 00 00 00 	data16 rex\.W callq 1c <bar\+0xf>	18: R_X86_64_PC32	foo-0x4
- [ 	]*[a-f0-9]+:	66 c7 f8 00 00       	xbeginw 21 <bar\+0x14>	1f: R_X86_64_PC16	foo-0x2
--[ 	]*[a-f0-9]+:	66 48 c7 f8 00 00 00 00 	data16 xbeginq 29 <bar\+0x1c>	25: R_X86_64_PLT32	foo-0x4
-+[ 	]*[a-f0-9]+:	66 48 c7 f8 00 00 00 00 	data16 xbeginq 29 <bar\+0x1c>	25: R_X86_64_PC32	foo-0x4
- [ 	]*[a-f0-9]+:	48 ff 18             	lcallq \*\(%rax\)
- [ 	]*[a-f0-9]+:	48 ff 29             	ljmpq  \*\(%rcx\)
- #pass
diff --git a/binutils.changes b/binutils.changes
index dd37a2f..17e44b9 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/binutils.spec b/binutils.spec
index a4f2061..b6e5018 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
 
 
 Name:           binutils
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -33,7 +34,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -49,6 +50,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -81,7 +83,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -277,7 +279,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -333,6 +336,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -505,6 +509,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index a2e0315..08604ea 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-aarch64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-aarch64-binutils
 ExcludeArch:    aarch64
 %define cross 1
 %define TARGET aarch64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 9736535..60c24ac 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-arm-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-arm-binutils
 ExcludeArch:    %arm
 %define cross 1
 %define TARGET arm
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 294a5fc..4a421b4 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-avr-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-avr-binutils
 ExcludeArch:    avr
 %define cross 1
 %define TARGET avr
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 340ff20..e7cbe92 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-epiphany-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-epiphany-binutils
 ExcludeArch:    epiphany
 %define cross 1
 %define TARGET epiphany
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 6c1be1f..2fdca61 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-hppa-binutils
 ExcludeArch:    hppa
 %define cross 1
 %define TARGET hppa
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index f9c44df..54d6837 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-hppa64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-hppa64-binutils
 ExcludeArch:    hppa64
 %define cross 1
 %define TARGET hppa64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 8ab41cd..932f606 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-i386-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-i386-binutils
 ExcludeArch:    %ix86
 %define cross 1
 %define TARGET i586
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 6451027..273f28b 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ia64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-ia64-binutils
 ExcludeArch:    ia64
 %define cross 1
 %define TARGET ia64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index dd6c6f1..3a35570 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-m68k-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-m68k-binutils
 ExcludeArch:    m68k
 %define cross 1
 %define TARGET m68k
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index f44cfea..ce9468c 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-mips-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-mips-binutils
 ExcludeArch:    mips
 %define cross 1
 %define TARGET mips
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 69d1d47..315ab66 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-ppc-binutils
 ExcludeArch:    ppc
 %define cross 1
 %define TARGET powerpc
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 0800bb9..05b1860 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-ppc64-binutils
 ExcludeArch:    ppc64
 %define cross 1
 %define TARGET powerpc64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 3fc6e04..02fc950 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-ppc64le-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-ppc64le-binutils
 ExcludeArch:    ppc64le
 %define cross 1
 %define TARGET powerpc64le
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 4373a2b..bd707f2 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-riscv64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-riscv64-binutils
 ExcludeArch:    riscv64
 %define cross 1
 %define TARGET riscv64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index 80832c9..0ed84b1 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-rx-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-rx-binutils
 ExcludeArch:    rx
 %define cross 1
 %define TARGET rx
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 32da44d..ff56f0a 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-s390-binutils
 ExcludeArch:    s390
 %define cross 1
 %define TARGET s390
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 1893863..379492e 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-s390x-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-s390x-binutils
 ExcludeArch:    s390x
 %define cross 1
 %define TARGET s390x
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index dea2b35..3cfa9a6 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-sparc-binutils
 ExcludeArch:    sparc
 %define cross 1
 %define TARGET sparc
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 0ed1d53..4ea7376 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-sparc64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-sparc64-binutils
 ExcludeArch:    sparc64
 %define cross 1
 %define TARGET sparc64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index be2f163..27639cf 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-spu-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-spu-binutils
 ExcludeArch:    spu
 %define cross 1
 %define TARGET spu
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 3169fc6..8230a26 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-x86_64-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-x86_64-binutils
 ExcludeArch:    x86_64
 %define cross 1
 %define TARGET x86_64
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/cross-xtensa-binutils.changes b/cross-xtensa-binutils.changes
index dd37a2f..17e44b9 100644
--- a/cross-xtensa-binutils.changes
+++ b/cross-xtensa-binutils.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Sun Jan 24 16:56:39 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Update to binutils 2.36:
+   New features in the Assembler:
+    General:
+     * When setting the link order attribute of ELF sections, it is now
+       possible to use a numeric section index instead of symbol name.
+     * Added a .nop directive to generate a single no-op instruction in
+       a target neutral manner.  This instruction does have an effect on
+       DWARF line number generation, if that is active.
+     * Removed --reduce-memory-overheads and --hash-size as gas now
+       uses hash tables that can be expand and shrink automatically.
+     X86/x86_64:
+       * Add support for AVX VNNI, HRESET, UINTR, TDX, AMX and Key
+         Locker instructions. 
+       * Support non-absolute segment values for lcall and ljmp.
+       * Add {disp16} pseudo prefix to x86 assembler.
+       * Configure with --enable-x86-used-note by default for Linux/x86.
+     ARM/AArch64:
+       * Add support for Cortex-A78, Cortex-A78AE and Cortex-X1,
+         Cortex-R82, Neoverse V1, and Neoverse N2 cores.
+       * Add support for ETMv4 (Embedded Trace Macrocell), ETE (Embedded
+         Trace Extension), TRBE (Trace Buffer Extension), CSRE (Call
+         Stack Recorder Extension) and BRBE (Branch Record Buffer
+         Extension) system registers.
+       * Add support for Armv8-R and Armv8.7-A ISA extensions.
+       * Add support for DSB memory nXS barrier, WFET and WFIT
+         instruction for Armv8.7.
+       * Add support for +csre feature for -march. Add CSR PDEC
+         instruction for CSRE feature in AArch64.
+       * Add support for +flagm feature for -march in Armv8.4 AArch64.
+       * Add support for +ls64 feature for -march in Armv8.7
+         AArch64. Add atomic 64-byte load/store instructions for this
+         feature. 
+       * Add support for +pauth (Pointer Authentication) feature for
+         -march in AArch64.
+    New features in the Linker:
+      * Add --error-handling-script=<NAME> command line option to allow
+        a helper script to be invoked when an undefined symbol or a
+        missing library is encountered.  This option can be suppressed
+        via the configure time switch: --enable-error-handling-script=no.
+      * Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark
+        x86-64-{baseline|v[234]} ISA level as needed.
+      * Add -z unique-symbol to avoid duplicated local symbol names.
+      * The creation of PE format DLLs now defaults to using a more
+        secure set of DLL characteristics.
+      * The linker now deduplicates the types in .ctf sections.  The new 
+         command-line option --ctf-share-types describes how to do this:
+         its default value, share-unconflicted, produces the most compact
+         output.
+      * The linker now omits the "variable section" from .ctf sections
+        by default, saving space.  This is almost certainly what you
+        want unless you are working on a project that has its own
+        analogue of symbol tables that are not reflected in the ELF
+        symtabs.
+  New features in other binary tools:
+      * The ar tool's previously unused l modifier is now used for
+        specifying dependencies of a static library. The arguments of
+        this option (or --record-libdeps long form option) will be
+        stored verbatim in the __.LIBDEP member of the archive, which
+        the linker may read at link time.
+      * Readelf can now display the contents of LTO symbol table
+        sections when asked to do so via the --lto-syms command line
+        option.
+      * Readelf now accepts the -C command line option to enable the
+        demangling of symbol names.  In addition the --demangle=<style>,
+        --no-demangle, --recurse-limit and --no-recurse-limit options
+        are also now availale.
+- Includes fixes for these CVEs:
+  bnc#1179898 aka CVE-2020-16590 aka PR25821
+  bnc#1179899 aka CVE-2020-16591 aka PR25822
+  bnc#1179900 aka CVE-2020-16592 aka PR25823
+  bnc#1179901 aka CVE-2020-16593 aka PR25827
+  bnc#1179902 aka CVE-2020-16598 aka PR25840
+  bnc#1179903 aka CVE-2020-16599 aka PR25842
+  bnc#1180451 aka CVE-2020-35493 aka PR25307
+  bnc#1180454 aka CVE-2020-35496 aka PR25308
+  bnc#1180461 aka CVE-2020-35507 aka PR25308
+- Rebase the following patches:
+ * binutils-fix-relax.diff
+ * binutils-revert-nm-symversion.diff
+ * binutils-revert-plt32-in-branches.diff
+- Add missing dependency on bc (ld.gold testsuite uses it).
+- Use --enable-obsolete for cross builds as ia64 is deprecated now.
+- Add binutils-2.36-branch.diff.gz.
+
 -------------------------------------------------------------------
 Fri Dec  4 14:52:54 UTC 2020 - Michael Matz <matz@suse.com>
 
diff --git a/cross-xtensa-binutils.spec b/cross-xtensa-binutils.spec
index b5ecb29..c353c5f 100644
--- a/cross-xtensa-binutils.spec
+++ b/cross-xtensa-binutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cross-xtensa-binutils
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@ Name:           cross-xtensa-binutils
 ExcludeArch:    xtensa
 %define cross 1
 %define TARGET xtensa
+BuildRequires:  bc
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
@@ -36,7 +37,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.35.1
+Version:        2.36
 Release:        0
 #
 # RUN_TESTS
@@ -52,6 +53,7 @@ Release:        0
 %else
 # XXX check again
 # XXX disabled because gold is seriously broken for now
+# Note that some gold tests fail due to gcc-PIE which leads PIE executables
 %define	make_check_handling	true
 %endif
 # let make check fail anyway if RUN_TESTS was requested
@@ -84,7 +86,7 @@ Source5:        binutils.keyring
 Source1:        pre_checkin.sh
 Source2:        README.First-for.SUSE.packagers
 Source3:        baselibs.conf
-Patch1:         binutils-2.35-branch.diff.gz
+Patch1:         binutils-2.36-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -280,7 +282,8 @@ cd build-dir
 %if "%{TARGET}" != "mips"
 	--enable-default-hash-style=both \
 %endif
-	--enable-shared
+	--enable-shared \
+	--enable-obsolete
 make %{?_smp_mflags} all-bfd TARGET-bfd=headers
 # force reconfiguring (???)
 rm bfd/Makefile
@@ -336,6 +339,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
   --with-system-zlib \
   --disable-nls \
   --enable-new-dtags \
+	--enable-obsolete \
 %if %{suse_version} <= 1320
   --disable-x86-relax-relocations \
 %endif
@@ -508,6 +512,8 @@ fi;
 %{_prefix}/%{HOST}/bin/*
 %{_prefix}/%{HOST}/lib/ldscripts
 %{_libdir}/ldscripts
+%dir %{_libdir}/bfd-plugins
+%{_libdir}/bfd-plugins/libdep.so
 %{_bindir}/*
 %ghost %_sysconfdir/alternatives/ld
 %ifarch %gold_archs
diff --git a/unit-at-a-time.patch b/unit-at-a-time.patch
index ae98b73..c76cdf2 100644
--- a/unit-at-a-time.patch
+++ b/unit-at-a-time.patch
@@ -6,10 +6,10 @@ Index: ld/testsuite/ld-selective/selective.exp
      {A::foo() B::foo() dropme1() dropme2()} {*-*-*}}
  }
  
--set cflags "-w -O -ffunction-sections -fdata-sections $NOSANTIZE_CFLAGS"
--set cxxflags "-fno-exceptions -fno-rtti $NOSANTIZE_CFLAGS"
-+set cflags "-w -O -ffunction-sections -fdata-sections -fno-unit-at-a-time $NOSANTIZE_CFLAGS"
-+set cxxflags "-fno-exceptions -fno-rtti -fno-unit-at-a-time $NOSANTIZE_CFLAGS"
+-set cflags "-w -O -ffunction-sections -fdata-sections $NOSANITIZE_CFLAGS $NOLTO_CFLAGS"
+-set cxxflags "-fno-exceptions -fno-rtti $NOSANITIZE_CFLAGS $NOLTO_CFLAGS"
++set cflags "-w -O -ffunction-sections -fdata-sections -fno-unit-at-a-time $NOSANITIZE_CFLAGS $NOLTO_CFLAGS"
++set cxxflags "-fno-exceptions -fno-rtti -fno-unit-at-a-time $NOSANITIZE_CFLAGS $NOLTO_CFLAGS"
  set ldflags "--gc-sections -Bstatic"
  
  if [istarget mips*-*] {