[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start = 

[gentoo-commits] repo/gentoo:master commit in: sys-boot/syslinux/, sys-boot/syslinux/files/6.04_pre3/

2022-05-30 Thread Mike Gilbert
commit: aee46be394f9a60ea69527fe1dd3c609602cf3ce
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue May 31 01:41:33 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue May 31 01:42:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee46be3

sys-boot/syslinux: remove duplicate patches

Signed-off-by: Mike Gilbert  gentoo.org>

 ...he-.note.gnu.property-section-for-the-mbr.patch |  47 
 ...inker-to-put-all-sections-into-a-single-P.patch | 311 -
 .../0003-GCC-10-compatibility-patch.patch  |  99 ---
 ...4-Inherit-toolchain-vars-from-environment.patch |  72 -
 sys-boot/syslinux/syslinux-6.04_pre3.ebuild|   3 +-
 5 files changed, 2 insertions(+), 530 deletions(-)

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
deleted file mode 100644
index 5d823436bec8..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 12:48:21 +0200
-Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
-
-This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
-to grow in size beyond what can fit into the master boot record.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026168.html

- mbr/i386/mbr.ld   | 6 +-
- mbr/x86_64/mbr.ld | 6 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
-index d14ba802..6d489904 100644
 a/mbr/i386/mbr.ld
-+++ b/mbr/i386/mbr.ld
-@@ -69,5 +69,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
-diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
-index ae27d49a..5b46db66 100644
 a/mbr/x86_64/mbr.ld
-+++ b/mbr/x86_64/mbr.ld
-@@ -68,5 +68,9 @@ SECTIONS
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
--  /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ :
-+  {
-+*(.note.GNU-stack)
-+*(.note.gnu.property)
-+  }
- }
--- 
-2.35.1
-

diff --git 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
 
b/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
deleted file mode 100644
index 33b6a36c63ea..
--- 
a/sys-boot/syslinux/files/6.04_pre3/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
-From: Lukas Schwaighofer 
-Date: Sat, 18 Aug 2018 16:56:35 +0200
-Subject: [PATCH 2/5] Force the linker to put all sections into a single
- PT_LOAD segment
-
-This is required when using binutils >= 2.31 which writes two PT_LOAD segments
-by default. This is not supported by the wrapper.c script used to convert the
-shared object into an elf binary.
-
-Forwarded: https://www.syslinux.org/archives/2018-August/026167.html

- efi/i386/syslinux.ld   | 37 +
- efi/x86_64/syslinux.ld | 37 +
- 2 files changed, 42 insertions(+), 32 deletions(-)
-
-diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
-index bab3fc74..19c16479 100644
 a/efi/i386/syslinux.ld
-+++ b/efi/i386/syslinux.ld
-@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
- OUTPUT_ARCH(i386)
- ENTRY(_start)
- 
-+PHDRS
-+{
-+  all PT_LOAD ;
-+}
-+
- SECTIONS
- {
-   . = 0;
-@@ -31,7 +36,7 @@ SECTIONS
-   *(.text)
-   *(.text.*)
-   __text_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(16);
- 
-@@ -40,7 +45,7 @@ SECTIONS
-   *(.rodata)
-   *(.rodata.*)
-   __rodata_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -49,14 +54,14 @@ SECTIONS
-   KEEP (*(SORT(.ctors.*)))
-   KEEP (*(.ctors))
-   __ctors_end = .;
--  }
-+  } :all
- 
-   .dtors : {
-   __dtors_start = .;
-   KEEP (*(SORT(.dtors.*)))
-   KEEP (*(.dtors))
-   __dtors_end = .;
--  }
-+  } :all
- 
-   . = ALIGN(4096);
-   .rel : {
-@@ -64,7 +69,7 @@ SECTIONS
-   *(.rel.data)
-   *(.rel.data.*)
-   *(.rel.ctors)
--  }
-+  } :all
- 
-   . = ALIGN(4);
- 
-@@ -72,14 +77,14 @@ SECTIONS
-   __gnu_hash_start =