gentoo resync : 14.05.2020

3 files changed, 0 insertions, 314 deletions

diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index c1945b39b523..f38e2bff9761 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,5 +1,3 @@
-AUX gnu-efi-3.0.6-ia64-gnu-hash.patch 4635 BLAKE2B b7e39832239e2a1be389fd6fa9e412804779d0a82a78ca50a21b139757f71973c418e7086cd89c2bbc457f1cbadf15e801152f85f27ec15164558f1bd6550cd1 SHA512 5cd62b5b114956fa37a3998fa79d9ddd4495a3621078d2d6972b2a784dfc69893fd42bbb096e253388baf49c84b0c16ae461c7eee61dd4b172207f48ca1ceb89
-AUX gnu-efi-3.0.6-ia64-setjmp.patch 3964 BLAKE2B 1475a5f188e86837303e1b91de3c37e06d95f67e8a67b8ddbc3d542df49791d9433601ca21f23c43fb57be98f68294385b2c2b0db67ce5f2b71eef55eee0adfe SHA512 146002da1ccb3a8d9b7430e52cafbf67c33691e0cbad443ef59ea6b7f604d04c82796c977977f64227c13d40d071eff8e0cb89f1d7d88d498fcc16871757b778
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b6f553ac0b2d8fdc83e49c69bec0dce1e2e8730705f70b3b7b0a61e4f065773667945ffc92a6f40eba381fcf6723 SHA512 1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a
 EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2970066312f081c9ab8ed47c7160516ff81623cddb409a186a7165632a61f58b96d2998caead7dcbdb2f6e0c79ac3a0ee39d2ca940358361841adfbcc990e58b SHA512 d708339e31740c150505ed11c9e1de707177717d14a8acf9c496969642b1a9c091120db3f70dc2baca45d94ae0c58f836966d5a5b30b989f19c6ff8dc03ba511
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-gnu-hash.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-gnu-hash.patch
deleted file mode 100644
index 9487ba4c6731..000000000000
--- a/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-gnu-hash.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-https://sourceforge.net/p/gnu-efi/code/merge-requests/1/
-
-From 2cc0b085fb82e80d43cc08c8376dff9f9532a72d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 27 Jan 2018 20:29:05 +0000
-Subject: [PATCH] gnuefi: preserve .gnu.hash sections (unbreaks elilo on IA-64)
-
-Gentoo has slightly modified linker defaults: --hash-style=gnu
-This means all ELF files in system have '.gnu.hash' section
-but no '.hash' section.
-
-gnuefi's ldscript did not account for it and as a result
-one symbol 'ImageBase' did not resolve locally for elilo.so
-and caused 'elilo' to fail to load by ia64 EFI:
-  Loading.: Gentoo (try new elilo)
-  ImageAddress: pointer is outside of image
-  ImageAddress: pointer is outside of image
-
-Those two relocations come from crt0-efi-ia64.S PE32 entry point
-fdescr:
-
-```
-    #define IMAGE_REL_BASED_DIR64<->10
-    .section .reloc, "a"
-    data4   _start_plabel // Page RVA
-    data4   12            // Block Size (2*4+2*2)
-    data2   (IMAGE_REL_BASED_DIR64<<12) +  0 // reloc for plabel's entry point
-    data2   (IMAGE_REL_BASED_DIR64<<12) +  8 // reloc for plabel's global pointer
-```
-
-These refer ImageBase.
-
-The change adds '.gnu.hash' collection (follows existing '.hash'
-collection).
-
-Tested on IA-64 by successfully booting elilo-3.16.
-
-Bug: https://bugs.gentoo.org/575300
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- README.gnuefi                  | 8 +++++++-
- gnuefi/elf_ia32_efi.lds        | 4 +++-
- gnuefi/elf_ia32_fbsd_efi.lds   | 4 +++-
- gnuefi/elf_ia64_efi.lds        | 4 +++-
- gnuefi/elf_x86_64_efi.lds      | 4 +++-
- gnuefi/elf_x86_64_fbsd_efi.lds | 4 +++-
- 6 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/README.gnuefi b/README.gnuefi
-index a7feec0..512698c 100644
---- a/README.gnuefi
-+++ b/README.gnuefi
-@@ -231,11 +231,17 @@ and page sized.These eight sections are used to group together the much
- greater number of sections that are typically present in ELF object files.
- Specifically:
- 
-- .hash
-+ .hash (and/or .gnu.hash)
- 	Collects the ELF .hash info (this section _must_ be the first
- 	section in order to build a shared object file; the section is
- 	not actually loaded or used at runtime).
- 
-+	GNU binutils provides a mechanism to generate different hash info
-+	via --hash-style=<sysv|gnu|both> option. In this case output
-+	shared object will contain .hash section, .gnu.hash section or
-+	both. In order to generate correct output linker script preserves
-+	both types of hash sections.
-+
-  .text
- 	Collects all sections containing executable code.
- 
-diff --git a/gnuefi/elf_ia32_efi.lds b/gnuefi/elf_ia32_efi.lds
-index 6cc4ce1..f27fe5f 100644
---- a/gnuefi/elf_ia32_efi.lds
-+++ b/gnuefi/elf_ia32_efi.lds
-@@ -5,7 +5,9 @@ SECTIONS
- {
-   . = 0;
-   ImageBase = .;
--  .hash : { *(.hash) }	/* this MUST come first! */
-+  /* .hash and/or .gnu.hash MUST come first! */
-+  .hash : { *(.hash) }
-+  .gnu.hash : { *(.gnu.hash) }
-   . = ALIGN(4096);
-   .text :
-   {
-diff --git a/gnuefi/elf_ia32_fbsd_efi.lds b/gnuefi/elf_ia32_fbsd_efi.lds
-index 77d6fad..cd309e2 100644
---- a/gnuefi/elf_ia32_fbsd_efi.lds
-+++ b/gnuefi/elf_ia32_fbsd_efi.lds
-@@ -5,7 +5,9 @@ SECTIONS
- {
-   . = 0;
-   ImageBase = .;
--  .hash : { *(.hash) }	/* this MUST come first! */
-+  /* .hash and/or .gnu.hash MUST come first! */
-+  .hash : { *(.hash) }
-+  .gnu.hash : { *(.gnu.hash) }
-   . = ALIGN(4096);
-   .text :
-   {
-diff --git a/gnuefi/elf_ia64_efi.lds b/gnuefi/elf_ia64_efi.lds
-index baca962..190792a 100644
---- a/gnuefi/elf_ia64_efi.lds
-+++ b/gnuefi/elf_ia64_efi.lds
-@@ -5,7 +5,9 @@ SECTIONS
- {
-   . = 0;
-   ImageBase = .;
--  .hash : { *(.hash) }	/* this MUST come first! */
-+  /* .hash and/or .gnu.hash MUST come first! */
-+  .hash : { *(.hash) }
-+  .gnu.hash : { *(.gnu.hash) }
-   . = ALIGN(4096);
-   .text :
-   {
-diff --git a/gnuefi/elf_x86_64_efi.lds b/gnuefi/elf_x86_64_efi.lds
-index 942d1f3..7be5902 100644
---- a/gnuefi/elf_x86_64_efi.lds
-+++ b/gnuefi/elf_x86_64_efi.lds
-@@ -6,7 +6,9 @@ SECTIONS
- {
-   . = 0;
-   ImageBase = .;
--  .hash : { *(.hash) }	/* this MUST come first! */
-+  /* .hash and/or .gnu.hash MUST come first! */
-+  .hash : { *(.hash) }
-+  .gnu.hash : { *(.gnu.hash) }
-   . = ALIGN(4096);
-   .eh_frame : 
-   { 
-diff --git a/gnuefi/elf_x86_64_fbsd_efi.lds b/gnuefi/elf_x86_64_fbsd_efi.lds
-index 6fd2031..fe1f334 100644
---- a/gnuefi/elf_x86_64_fbsd_efi.lds
-+++ b/gnuefi/elf_x86_64_fbsd_efi.lds
-@@ -6,7 +6,9 @@ SECTIONS
- {
-   . = 0;
-   ImageBase = .;
--  .hash : { *(.hash) }	/* this MUST come first! */
-+  /* .hash and/or .gnu.hash MUST come first! */
-+  .hash : { *(.hash) }
-+  .gnu.hash : { *(.gnu.hash) }
-   . = ALIGN(4096);
-   .eh_frame : 
-   { 
--- 
-2.16.1
-
diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-setjmp.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-setjmp.patch
deleted file mode 100644
index b09644265001..000000000000
--- a/sys-boot/gnu-efi/files/gnu-efi-3.0.6-ia64-setjmp.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-https://sourceforge.net/p/gnu-efi/code/merge-requests/2/
-
-From 0e6995a96b0f5867c8d85fbd251cfbc295a3fc4d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 28 Jan 2018 16:44:21 +0000
-Subject: [PATCH] gnu-efi: fix lib/ia64/setjmp.S IA-64 build failure
-
-The build failed as:
-  lib/ia64/setjmp.S:171: Error: Unknown opcode `ldf.nt1 f26=[r10],8'
-  lib/ia64/setjmp.S:178: Error: Operand 1 of `ldf.fill.nt1' should be a floating-point register
-
-The change syncs longjmp definition with
-    edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ipf/setjmp.s
-pulling in:
-- branch in the end of function
-- registers used wrong instruction for float restore
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- lib/ia64/setjmp.S | 61 +++++++++++++++++++++++++++----------------------------
- 1 file changed, 30 insertions(+), 31 deletions(-)
-
-diff --git a/lib/ia64/setjmp.S b/lib/ia64/setjmp.S
-index c806fbc..bbb29d8 100644
---- a/lib/ia64/setjmp.S
-+++ b/lib/ia64/setjmp.S
-@@ -16,11 +16,11 @@ BASIS,
- 	.globl	setjmp
- 	.type	setjmp, @function
- setjmp:
--	alloc	loc = ar.pfs, 1, 2, 1, 0
-+	alloc	loc0 = ar.pfs, 1, 2, 1, 0
- 	;;
- 	mov	r14 = ar.unat
- 	mov	r15 = ar.bsp
--	add	r10 = 0x10 * 20, in0
-+	add	r10 = 0x10*20, in0
- 	;;
- 	stf.spill.nta	[in0] = f2, 0x10 
- 	st8.spill.nta	[r10] = r4, 8
-@@ -98,29 +98,25 @@ setjmp:
- 
- 	.globl	longjmp
- 	.type	longjmp, @function
--	.regstk
-+	.regstk 2, 0, 0, 0
- longjmp:
--	add		r10 = 0x10 * 20 + 8*14, in0
--	movl		r2 = ~(((1<<14) - 1) << 16) | 3)
-+	add		r10 = 0x10*20 + 8*14, in0
-+	movl		r2  = ~((((1<<14) - 1) << 16) | 3)
- 	;;
- 	ld8.nt1		r14 = [r10], -8*2
- 	mov		r15 = ar.bspstore
- 	;;
- 	ld8.nt1		r17 = [r10], -8
- 	mov		r16 = ar.rsc
--	cmp.leu		p6 = r14, r15
-+	cmp.leu		p6  = r14, r15
- 	;;
- 	ld8.nt1		r18 = [r10], -8
- 	ld8.nt1		r25 = [r10], -8
--	and		r2 = r16, r2
-+	and		r2  = r16, r2
- 	;;
--	ldf.fill.nt1	f2 = [in0], 0x10
-+	ldf.fill.nt1	f2  = [in0], 0x10
- 	ld8.nt1		r24 = [r10], -8
--	mov		b5 = r25
--	;;
--	mov		ar.rsc = r2
--	ld8.nt1		r23 = [r10], -8
--	mov		b5 = r25
-+	mov		b5  = r25
- 	;;
- 	mov		ar.rsc = r2
- 	ld8.nt1		r23 = [r10], -8
-@@ -137,51 +133,51 @@ _skip_flushrs:
- 	mov		r31 = ar.rnat
- 	loadrs
- 	;;
--	ldf.fill.nt1	f4 = [in0], 0x10
-+	ldf.fill.nt1	f4  = [in0], 0x10
- 	ld8.nt1		r22 = [r10], -8
--	dep		r2 = -1, r14, 3, 6
-+	dep		r2  = -1, r14, 3, 6
- 	;;
--	ldf.fill.nt1	f5 = [in0], 0x10
--	ld8.nt1		f21 = [r10], -8
--	cmp		p6 = r2, r15
-+	ldf.fill.nt1	f5  = [in0], 0x10
-+	ld8.nt1		r21 = [r10], -8
-+	cmp.ltu		p6  = r2, r15
- 	;;
- 	ld8.nt1		r20 = [r10], -0x10
- (p6)	ld8.nta		r31 = [r2]
--	mov		b3 = r23
-+	mov		b3  = r23
- 	;;
- 	ldf.fill.nt1	f16 = [in0], 0x10
--	ld8.fill.nt1	r7 = [r10], -8
--	mov		b2 = r22
-+	ld8.fill.nt1	r7  = [r10], -8
-+	mov		b2  = r22
- 	;;
- 	ldf.fill.nt1	f17 = [in0], 0x10
--	ld8.fill.nt1	r6 = [r10], -8
--	mov		b1 = r21
-+	ld8.fill.nt1	r6  = [r10], -8
-+	mov		b1  = r21
- 	;;
- 	ldf.fill.nt1	f18 = [in0], 0x10
--	ld8.fill.nt1	r5 = [r10], -8
--	mov		b0 = r20
-+	ld8.fill.nt1	r5  = [r10], -8
-+	mov		b0  = r20
- 	;;
- 	ldf.fill.nt1	f19 = [in0], 0x10
--	ld8.fill.nt1	r4 = [r10], 8*13
-+	ld8.fill.nt1	r4  = [r10], 8*13
- 	;;
- 	ldf.fill.nt1	f20 = [in0], 0x10
- 	ld8.nt1		r19 = [r10], 0x10
- 	;;
- 	ldf.fill.nt1	f21 = [in0], 0x10
--	ldf.nt1		f26 = [r10], 8
-+	ld8.nt1		r26 = [r10], 8
- 	mov		ar.pfs = r19
- 	;;
- 	ldf.fill.nt1	f22 = [in0], 0x10
- 	ld8.nt1		r27 = [r10], 8
--	mov		pr = r26, -1
-+	mov		pr  = r26, -1
- 	;;
--	ldf.fill.nt1	r23 = [in0], 0x10
-+	ldf.fill.nt1	f23 = [in0], 0x10
- 	ld8.nt1		r28 = [r10], -17*8 - 0x10
- 	mov		ar.lc = r27
- 	;;
- 	ldf.fill.nt1	f24 = [in0], 0x10
- 	ldf.fill.nt1	f25 = [in0], 0x10
--	mov		r8 = in1
-+	mov		r8  = in1
- 	;;
- 	ldf.fill.nt1	f26 = [in0], 0x10
- 	ldf.fill.nt1	f31 = [r10], -0x10
-@@ -192,9 +188,12 @@ _skip_flushrs:
- 	ldf.fill.nt1	f28 = [in0]
- 	ldf.fill.nt1	f29 = [r10], 0x10*3 + 8*4
- 	;;
--	ld8.fill.nt1	sp = [r10]
-+	ld8.fill.nt1	sp  = [r10]
- 	mov		ar.unat = r18
- 	;;
- 	mov		ar.bspstore = r14
- 	mov		ar.rnat = r31
- 	;;
-+	invala
-+	mov		ar.rsc = r16
-+	br.ret.sptk	b0
--- 
-2.16.1
-