gentoo resync : 30.05.2020

9 files changed, 0 insertions, 384 deletions

diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 30448bd900da..b5c60b780a29 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,15 +1,7 @@
-AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24
-AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1
-AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b
-AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a8609426d35a1217cbb0718e7580c2a3b646a7d493d4b7aecc25dee35f61f7e036904e6b7dde8d3d398842dab7149053da2a2761a3 SHA512 4f33d849210da633629e16e96779dce2e03c0d1e6f44b91b68410e35433378f8cf0a04736d161539ea368f54a713177e6e8df2fde93d40c6917d03ad74a99c2c
-AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
-AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
-AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 AUX libffi-3.3-power7-memcpy-2.patch 1086 BLAKE2B 954504aca37f2dd16913c3fb3d61e8fb5e8db017d897405905366f4701bf2357871dd41e86e59050733f04321e0155b03683577f132504aec5c476cc78323be6 SHA512 5a0d8590c2e53e20e4384dad704060a2c781b91487a0e14d2f1521f69b722ccc60e25b84c38f9ded65b01bef49250e07c6935be577d100aea18496abfbe374f5
 AUX libffi-3.3-power7-memcpy.patch 1681 BLAKE2B 6e3df741b07718f13c347ae54fe82bbf0f433790d14dff4114ffa77f2c3700460801af3fc5a649589ab2d1d0122db0729cd1aaa5321ea3f7822b1cd4d7f64b05 SHA512 13eb09d8080cadedb959c8d62d37f80bf3c32fbe488fdb59955ff6c8649f1086baaedb015e47ee52de65836f57bc172dbce2d2b3bc1aee6aca07eb9da451cf70
 AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534
-AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-3.3-r1.ebuild 2792 BLAKE2B cb9ff2ba67aaa92522f8e7a4d808db29c006bad4bd2eee00f1ddab0939c8a6bbb2ac05cd98d09a990787f12cf284523264daec11c50acd79c383f9af96c0094c SHA512 90c1e7e9f7d186f6100dc0d5a4c4bbc45c14cc6dfc4bc803bc1853c6b18a3ac5ce17ed30a84967ddee59881c3e2c8764efb4092a844ed81eec01ad7d20d7c6e0
diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
deleted file mode 100644
index e5f100e56726..000000000000
--- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=513428
-https://bugs.gentoo.org/show_bug.cgi?id=536764
-https://trac.macports.org/ticket/44170
-
---- libffi-3.2.1/src/x86/win32.S
-+++ libffi-3.2.1/src/x86/win32.S
-@@ -1184,7 +1184,6 @@
- 
- #if defined(X86_WIN32) && !defined(__OS2__)
-         .section	.eh_frame,"w"
--#endif
- .Lframe1:
- .LSCIE1:
-         .long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
-@@ -1343,6 +1342,7 @@
-         /* End of DW_CFA_xxx CFI instructions.  */
-         .align 4
- .LEFDE5:
-+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
- 
- #endif /* !_MSC_VER */
- 
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
deleted file mode 100644
index fd5c1ea4b282..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-ia64: fix small struct handling (missing complex type entry)
-
-commit 6e8a4460833594d5af1b4539178025da0077df19
-added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER)
-
-ia64 ffi_closure_unix reiles on the ordering of
-types as ia64 has ia64-specific FFI types:
-small struct and others.
-
-As a result all tests handling small structs broke.
-
-The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX.
-This has positive effect of unbreaking most tests:
-
-                 === libffi Summary ===
- 
--# of expected passes            1595
--# of unexpected failures        295
-+# of expected passes            1930
-+# of unexpected failures        10
- # of unsupported tests          30
-
-Bug: https://bugs.gentoo.org/634190
---- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -529,6 +529,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lst_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lst_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lst_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lst_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lst_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
-@@ -550,6 +551,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lld_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lld_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lld_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
deleted file mode 100644
index 5e8c943eee38..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/alpha/osf.S.orig	2015-01-16 10:46:15.000000000 +0100
-+++ b/src/alpha/osf.S	2015-01-16 10:46:24.000000000 +0100
-@@ -279,6 +279,7 @@
- 	.gprel32 $load_64	# FFI_TYPE_SINT64
- 	.gprel32 $load_none	# FFI_TYPE_STRUCT
- 	.gprel32 $load_64	# FFI_TYPE_POINTER
-+	.gprel32 $load_none	# FFI_TYPE_COMPLEX
- 
- /* Assert that the table above is in sync with ffi.h.  */
- 
-@@ -294,7 +295,8 @@
- 	|| FFI_TYPE_SINT64 != 12	\
- 	|| FFI_TYPE_STRUCT != 13	\
- 	|| FFI_TYPE_POINTER != 14	\
--	|| FFI_TYPE_LAST != 14
-+	|| FFI_TYPE_COMPLEX != 15       \
-+	|| FFI_TYPE_LAST != 15
- #error "osf.S out of sync with ffi.h"
- #endif
- 
diff --git a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
deleted file mode 100644
index 6e21f3566bc9..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 17 Feb 2018 19:00:40 +0000
-Subject: [PATCH 2/2] ia64: fix small struct return
-
-This change fixes libffi.call/struct10.c failure on ia64:
-FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test
-
-.Lst_small_struct handles returns for structs less than 32 bytes
-(following ia64 return value ABI [1]). Subroutine does roughly the
-following:
-
-```
-    mov [sp+0]  = r8
-    mov [sp+8]  = r9
-    mov [sp+16] = r10
-    mov [sp+24] = r11
-    memcpy(destination, source=sp, 12);
-```
-
-The problem: ia64 ABI guarantees that top 16 bytes of stack are
-scratch space for callee function. Thus it can clobber it. [1]
-says (7.1 Procedure Frames):
-"""
-* Scratch area. This 16-byte region is provided as scratch storage
-  for procedures that are called by the current procedure. Leaf
-  procedures do not need to allocate this region. A procedure may
-  use the 16 bytes at the top of its own frame as scratch memory,
-  but the contents of this area are not preserved by a procedure call.
-"""
-
-In our case 16 top bytes are clobbered by a PLT resolver when memcpy()
-is called for the first time. As a result memcpy implementation reads
-already clobbered data frop top of stack.
-
-The fix is simple: allocate 16 bytes of scrats space prior to memcpy()
-call.
-
-[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf
-
-Bug: https://bugs.gentoo.org/634190
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/ia64/unix.S | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/ia64/unix.S b/src/ia64/unix.S
-index 4733377..e2547e0 100644
---- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -175,7 +175,6 @@ ffi_call_unix:
- 	;;
- 
- .Lst_small_struct:
--	add	sp = -16, sp
- 	cmp.lt	p6, p0 = 8, in3
- 	cmp.lt	p7, p0 = 16, in3
- 	cmp.lt	p8, p0 = 24, in3
-@@ -191,6 +190,12 @@ ffi_call_unix:
- (p8)	st8	[r18] = r11
- 	mov	out1 = sp
- 	mov	out2 = in3
-+	;;
-+	// ia64 software calling convention requires
-+	// top 16 bytes of stack to be scratch space
-+	// PLT resolver uses that scratch space at
-+	// 'memcpy' symbol reolution time
-+	add	sp = -16, sp
- 	br.call.sptk.many b0 = memcpy#
- 	;;
- 	mov	ar.pfs = loc0
--- 
-2.16.1
-
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
deleted file mode 100644
index 522e1fa9c486..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Autogenerated part of libffi-3.2.1-include-path.patch
-
-https://bugs.gentoo.org/643582
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 9d747e8..99ecfd7 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \
--am__installdirs = "$(DESTDIR)$(includesdir)"
--HEADERS = $(nodist_includes_HEADERS)
-+am__installdirs = "$(DESTDIR)$(includedir)"
-+HEADERS = $(nodist_include_HEADERS)
-@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
--nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-@@ -360 +359 @@ clean-libtool:
--install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
-@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
--	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--uninstall-nodist_includesHEADERS:
-+uninstall-nodist_includeHEADERS:
-@@ -378 +377 @@ uninstall-nodist_includesHEADERS:
--	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -380 +379 @@ uninstall-nodist_includesHEADERS:
--	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
-+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-@@ -468 +467 @@ installdirs:
--	for dir in "$(DESTDIR)$(includesdir)"; do \
-+	for dir in "$(DESTDIR)$(includedir)"; do \
-@@ -522 +521 @@ info-am:
--install-data-am: install-nodist_includesHEADERS
-+install-data-am: install-nodist_includeHEADERS
-@@ -566 +565 @@ ps-am:
--uninstall-am: uninstall-nodist_includesHEADERS
-+uninstall-am: uninstall-nodist_includeHEADERS
-@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS
--	install-nodist_includesHEADERS install-pdf install-pdf-am \
-+	install-nodist_includeHEADERS install-pdf install-pdf-am \
-@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS
--	uninstall-am uninstall-nodist_includesHEADERS
-+	uninstall-am uninstall-nodist_includeHEADERS
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
deleted file mode 100644
index e1269b2398a4..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/643582
-
-From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
-From: Yen Chi Hsuan <yan12125@gmail.com>
-Date: Sun, 13 Nov 2016 19:17:19 +0800
-Subject: [PATCH] Install public headers in the standard path
-
----
- include/Makefile.am | 3 +--
- libffi.pc.in        | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index bb241e8..c59df9f 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
- noinst_HEADERS=ffi_common.h ffi_cfi.h
- EXTRA_DIST=ffi.h.in
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
--nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-diff --git a/libffi.pc.in b/libffi.pc.in
-index edf6fde..6fad83b 100644
---- a/libffi.pc.in
-+++ b/libffi.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- toolexeclibdir=@toolexeclibdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
--- 
-2.15.1
-
diff --git a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch b/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
deleted file mode 100644
index 7c011d2b6d07..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/libffi/libffi/commit/e169ba2b83c780058fe626856cfdb5903a85cb97.patch
-https://bugs.gentoo.org/694916
-
-From e169ba2b83c780058fe626856cfdb5903a85cb97 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Fri, 29 Apr 2016 21:04:07 -0400
-Subject: [PATCH] Fix usage on musl libc
-
-A gcc compiled on musl does not define __gnu_linux__, it defines __linux__.
-Only on glibc does __gnu_linux__ get defined, but both define __linux__, so
-we should check for that instead.
-
-With this patch, libffi works perfectly, and passes its testsuite entirely
-on musl libc systems.
----
- src/closures.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/closures.c b/src/closures.c
-index 3dec0e31..05849e06 100644
---- a/src/closures.c
-+++ b/src/closures.c
-@@ -35,7 +35,7 @@
- #include <ffi_common.h>
- 
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
deleted file mode 100644
index c6286f349900..000000000000
--- a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 19 May 2018 10:49:07 +0100
-Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section
-
-Before the change hand-crafted .eh_frame section contained
-ABS relocation and caused TEXTREL tag to be emitted:
-
-```
-$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text
-$ make
-...
-/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld:
-    read-only segment has dynamic relocations.
-```
-
-Link failure is caused by absolute address of FDEs
-encoded into .eh_frame entries.
-
-Fixed TEXTREL by using pcrel (instead of ABS) encoding
-for absolute addresses (__PIC__ code) by adding augmentation
-information ("zR" CIE type).
-
-All tests still pass on hppa2.0. The specific tests that still pass
-and exercise this code path:
-    testsuite/libffi.call/unwindtest.cc
-    testsuite/libffi.call/unwindtest_ffi_call.cc
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/pa/linux.S | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/pa/linux.S b/src/pa/linux.S
-index f11ae76..ab04c75 100644
---- a/src/pa/linux.S
-+++ b/src/pa/linux.S
-@@ -297,10 +297,18 @@ ffi_closure_pa32:
- .LSCIE1:
- 	.word   0x0     ;# CIE Identifier Tag
- 	.byte   0x1     ;# CIE Version
-+#ifdef __PIC__
-+	.ascii  "zR\0"  ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
-+#else
- 	.ascii "\0"     ;# CIE Augmentation
-+#endif
- 	.uleb128 0x1    ;# CIE Code Alignment Factor
- 	.sleb128 4      ;# CIE Data Alignment Factor
- 	.byte   0x2     ;# CIE RA Column
-+#ifdef __PIC__
-+	.uleb128 0x1    ;# Augmentation size
-+	.byte	0x1b    ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
-+#endif
- 	.byte   0xc     ;# DW_CFA_def_cfa
- 	.uleb128 0x1e
- 	.uleb128 0x0
-@@ -310,9 +318,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE1-.LASFDE1        ;# FDE Length
- .LASFDE1:
- 	.word   .LASFDE1-.Lframe1       ;# FDE CIE offset
--	.word   .LFB1   ;# FDE initial location
-+#ifdef __PIC__
-+	.word	.LFB1-. ;# FDE initial location
-+#else
-+	.word	.LFB1   ;# FDE initial location
-+#endif
- 	.word   .LFE1-.LFB1     ;# FDE address range
--
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI11-.LFB1
- 	.byte	0x83	;# DW_CFA_offset, column 0x3
-@@ -338,8 +352,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE2-.LASFDE2        ;# FDE Length
- .LASFDE2:
- 	.word   .LASFDE2-.Lframe1       ;# FDE CIE offset
-+#ifdef __PIC__
-+	.word   .LFB2-. ;# FDE initial location
-+#else
- 	.word   .LFB2   ;# FDE initial location
-+#endif
- 	.word   .LFE2-.LFB2     ;# FDE address range
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI21-.LFB2
- 	.byte   0x83    ;# DW_CFA_offset, column 0x3
--- 
-2.19.0
-