| 1 |
commit: e565f33ed9589a3711de4e2112cee40391c9ee9d |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed May 20 15:32:38 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 21 08:22:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e565f33e |
| 7 |
|
| 8 |
dev-libs/libffi: remove unused patches |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/libffi/files/libffi-3.1-darwin-x32.patch | 22 ----- |
| 15 |
.../libffi/files/libffi-3.2.1-complex-ia64.patch | 41 ---------- |
| 16 |
.../libffi/files/libffi-3.2.1-complex_alpha.patch | 20 ----- |
| 17 |
.../files/libffi-3.2.1-ia64-small-struct.patch | 74 ----------------- |
| 18 |
.../files/libffi-3.2.1-include-path-autogen.patch | 56 ------------- |
| 19 |
.../libffi/files/libffi-3.2.1-include-path.patch | 39 --------- |
| 20 |
.../libffi/files/libffi-3.2.1-musl-emutramp.patch | 31 -------- |
| 21 |
.../files/libffi-3.3_rc0-hppa-no-TEXTREL.patch | 93 ---------------------- |
| 22 |
8 files changed, 376 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch |
| 25 |
deleted file mode 100644 |
| 26 |
index e5f100e5672..00000000000 |
| 27 |
--- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,22 +0,0 @@ |
| 30 |
-https://bugs.gentoo.org/show_bug.cgi?id=513428 |
| 31 |
-https://bugs.gentoo.org/show_bug.cgi?id=536764 |
| 32 |
-https://trac.macports.org/ticket/44170 |
| 33 |
- |
| 34 |
---- libffi-3.2.1/src/x86/win32.S |
| 35 |
-+++ libffi-3.2.1/src/x86/win32.S |
| 36 |
-@@ -1184,7 +1184,6 @@ |
| 37 |
- |
| 38 |
- #if defined(X86_WIN32) && !defined(__OS2__) |
| 39 |
- .section .eh_frame,"w" |
| 40 |
--#endif |
| 41 |
- .Lframe1: |
| 42 |
- .LSCIE1: |
| 43 |
- .long .LECIE1-.LASCIE1 /* Length of Common Information Entry */ |
| 44 |
-@@ -1343,6 +1342,7 @@ |
| 45 |
- /* End of DW_CFA_xxx CFI instructions. */ |
| 46 |
- .align 4 |
| 47 |
- .LEFDE5: |
| 48 |
-+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */ |
| 49 |
- |
| 50 |
- #endif /* !_MSC_VER */ |
| 51 |
- |
| 52 |
|
| 53 |
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 |
| 54 |
deleted file mode 100644 |
| 55 |
index fd5c1ea4b28..00000000000 |
| 56 |
--- a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,41 +0,0 @@ |
| 59 |
-ia64: fix small struct handling (missing complex type entry) |
| 60 |
- |
| 61 |
-commit 6e8a4460833594d5af1b4539178025da0077df19 |
| 62 |
-added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER) |
| 63 |
- |
| 64 |
-ia64 ffi_closure_unix reiles on the ordering of |
| 65 |
-types as ia64 has ia64-specific FFI types: |
| 66 |
-small struct and others. |
| 67 |
- |
| 68 |
-As a result all tests handling small structs broke. |
| 69 |
- |
| 70 |
-The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX. |
| 71 |
-This has positive effect of unbreaking most tests: |
| 72 |
- |
| 73 |
- === libffi Summary === |
| 74 |
- |
| 75 |
--# of expected passes 1595 |
| 76 |
--# of unexpected failures 295 |
| 77 |
-+# of expected passes 1930 |
| 78 |
-+# of unexpected failures 10 |
| 79 |
- # of unsupported tests 30 |
| 80 |
- |
| 81 |
-Bug: https://bugs.gentoo.org/634190 |
| 82 |
---- a/src/ia64/unix.S |
| 83 |
-+++ b/src/ia64/unix.S |
| 84 |
-@@ -529,6 +529,7 @@ ffi_closure_unix: |
| 85 |
- data8 @pcrel(.Lst_int64) // FFI_TYPE_SINT64 |
| 86 |
- data8 @pcrel(.Lst_void) // FFI_TYPE_STRUCT |
| 87 |
- data8 @pcrel(.Lst_int64) // FFI_TYPE_POINTER |
| 88 |
-+ data8 @pcrel(.Lst_void) // FFI_TYPE_COMPLEX (not implemented) |
| 89 |
- data8 @pcrel(.Lst_small_struct) // FFI_IA64_TYPE_SMALL_STRUCT |
| 90 |
- data8 @pcrel(.Lst_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT |
| 91 |
- data8 @pcrel(.Lst_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE |
| 92 |
-@@ -550,6 +551,7 @@ ffi_closure_unix: |
| 93 |
- data8 @pcrel(.Lld_int) // FFI_TYPE_SINT64 |
| 94 |
- data8 @pcrel(.Lld_void) // FFI_TYPE_STRUCT |
| 95 |
- data8 @pcrel(.Lld_int) // FFI_TYPE_POINTER |
| 96 |
-+ data8 @pcrel(.Lld_void) // FFI_TYPE_COMPLEX (not implemented) |
| 97 |
- data8 @pcrel(.Lld_small_struct) // FFI_IA64_TYPE_SMALL_STRUCT |
| 98 |
- data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT |
| 99 |
- data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE |
| 100 |
|
| 101 |
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 |
| 102 |
deleted file mode 100644 |
| 103 |
index 5e8c943eee3..00000000000 |
| 104 |
--- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch |
| 105 |
+++ /dev/null |
| 106 |
@@ -1,20 +0,0 @@ |
| 107 |
---- a/src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 |
| 108 |
-+++ b/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 |
| 109 |
-@@ -279,6 +279,7 @@ |
| 110 |
- .gprel32 $load_64 # FFI_TYPE_SINT64 |
| 111 |
- .gprel32 $load_none # FFI_TYPE_STRUCT |
| 112 |
- .gprel32 $load_64 # FFI_TYPE_POINTER |
| 113 |
-+ .gprel32 $load_none # FFI_TYPE_COMPLEX |
| 114 |
- |
| 115 |
- /* Assert that the table above is in sync with ffi.h. */ |
| 116 |
- |
| 117 |
-@@ -294,7 +295,8 @@ |
| 118 |
- || FFI_TYPE_SINT64 != 12 \ |
| 119 |
- || FFI_TYPE_STRUCT != 13 \ |
| 120 |
- || FFI_TYPE_POINTER != 14 \ |
| 121 |
-- || FFI_TYPE_LAST != 14 |
| 122 |
-+ || FFI_TYPE_COMPLEX != 15 \ |
| 123 |
-+ || FFI_TYPE_LAST != 15 |
| 124 |
- #error "osf.S out of sync with ffi.h" |
| 125 |
- #endif |
| 126 |
- |
| 127 |
|
| 128 |
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 |
| 129 |
deleted file mode 100644 |
| 130 |
index 6e21f3566bc..00000000000 |
| 131 |
--- a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch |
| 132 |
+++ /dev/null |
| 133 |
@@ -1,74 +0,0 @@ |
| 134 |
-From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001 |
| 135 |
-From: Sergei Trofimovich <slyfox@g.o> |
| 136 |
-Date: Sat, 17 Feb 2018 19:00:40 +0000 |
| 137 |
-Subject: [PATCH 2/2] ia64: fix small struct return |
| 138 |
- |
| 139 |
-This change fixes libffi.call/struct10.c failure on ia64: |
| 140 |
-FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test |
| 141 |
- |
| 142 |
-.Lst_small_struct handles returns for structs less than 32 bytes |
| 143 |
-(following ia64 return value ABI [1]). Subroutine does roughly the |
| 144 |
-following: |
| 145 |
- |
| 146 |
-``` |
| 147 |
- mov [sp+0] = r8 |
| 148 |
- mov [sp+8] = r9 |
| 149 |
- mov [sp+16] = r10 |
| 150 |
- mov [sp+24] = r11 |
| 151 |
- memcpy(destination, source=sp, 12); |
| 152 |
-``` |
| 153 |
- |
| 154 |
-The problem: ia64 ABI guarantees that top 16 bytes of stack are |
| 155 |
-scratch space for callee function. Thus it can clobber it. [1] |
| 156 |
-says (7.1 Procedure Frames): |
| 157 |
-""" |
| 158 |
-* Scratch area. This 16-byte region is provided as scratch storage |
| 159 |
- for procedures that are called by the current procedure. Leaf |
| 160 |
- procedures do not need to allocate this region. A procedure may |
| 161 |
- use the 16 bytes at the top of its own frame as scratch memory, |
| 162 |
- but the contents of this area are not preserved by a procedure call. |
| 163 |
-""" |
| 164 |
- |
| 165 |
-In our case 16 top bytes are clobbered by a PLT resolver when memcpy() |
| 166 |
-is called for the first time. As a result memcpy implementation reads |
| 167 |
-already clobbered data frop top of stack. |
| 168 |
- |
| 169 |
-The fix is simple: allocate 16 bytes of scrats space prior to memcpy() |
| 170 |
-call. |
| 171 |
- |
| 172 |
-[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf |
| 173 |
- |
| 174 |
-Bug: https://bugs.gentoo.org/634190 |
| 175 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 176 |
---- |
| 177 |
- src/ia64/unix.S | 7 ++++++- |
| 178 |
- 1 file changed, 6 insertions(+), 1 deletion(-) |
| 179 |
- |
| 180 |
-diff --git a/src/ia64/unix.S b/src/ia64/unix.S |
| 181 |
-index 4733377..e2547e0 100644 |
| 182 |
---- a/src/ia64/unix.S |
| 183 |
-+++ b/src/ia64/unix.S |
| 184 |
-@@ -175,7 +175,6 @@ ffi_call_unix: |
| 185 |
- ;; |
| 186 |
- |
| 187 |
- .Lst_small_struct: |
| 188 |
-- add sp = -16, sp |
| 189 |
- cmp.lt p6, p0 = 8, in3 |
| 190 |
- cmp.lt p7, p0 = 16, in3 |
| 191 |
- cmp.lt p8, p0 = 24, in3 |
| 192 |
-@@ -191,6 +190,12 @@ ffi_call_unix: |
| 193 |
- (p8) st8 [r18] = r11 |
| 194 |
- mov out1 = sp |
| 195 |
- mov out2 = in3 |
| 196 |
-+ ;; |
| 197 |
-+ // ia64 software calling convention requires |
| 198 |
-+ // top 16 bytes of stack to be scratch space |
| 199 |
-+ // PLT resolver uses that scratch space at |
| 200 |
-+ // 'memcpy' symbol reolution time |
| 201 |
-+ add sp = -16, sp |
| 202 |
- br.call.sptk.many b0 = memcpy# |
| 203 |
- ;; |
| 204 |
- mov ar.pfs = loc0 |
| 205 |
--- |
| 206 |
-2.16.1 |
| 207 |
- |
| 208 |
|
| 209 |
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 |
| 210 |
deleted file mode 100644 |
| 211 |
index 522e1fa9c48..00000000000 |
| 212 |
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch |
| 213 |
+++ /dev/null |
| 214 |
@@ -1,56 +0,0 @@ |
| 215 |
-Autogenerated part of libffi-3.2.1-include-path.patch |
| 216 |
- |
| 217 |
-https://bugs.gentoo.org/643582 |
| 218 |
-diff --git a/include/Makefile.in b/include/Makefile.in |
| 219 |
-index 9d747e8..99ecfd7 100644 |
| 220 |
---- a/include/Makefile.in |
| 221 |
-+++ b/include/Makefile.in |
| 222 |
-@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \ |
| 223 |
--am__installdirs = "$(DESTDIR)$(includesdir)" |
| 224 |
--HEADERS = $(nodist_includes_HEADERS) |
| 225 |
-+am__installdirs = "$(DESTDIR)$(includedir)" |
| 226 |
-+HEADERS = $(nodist_include_HEADERS) |
| 227 |
-@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h |
| 228 |
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include |
| 229 |
--nodist_includes_HEADERS = ffi.h ffitarget.h |
| 230 |
-+nodist_include_HEADERS = ffi.h ffitarget.h |
| 231 |
-@@ -360 +359 @@ clean-libtool: |
| 232 |
--install-nodist_includesHEADERS: $(nodist_includes_HEADERS) |
| 233 |
-+install-nodist_includeHEADERS: $(nodist_include_HEADERS) |
| 234 |
-@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) |
| 235 |
-- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ |
| 236 |
-+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ |
| 237 |
-@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) |
| 238 |
-- echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ |
| 239 |
-- $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ |
| 240 |
-+ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ |
| 241 |
-+ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ |
| 242 |
-@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) |
| 243 |
-- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \ |
| 244 |
-- $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \ |
| 245 |
-+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ |
| 246 |
-+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ |
| 247 |
-@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) |
| 248 |
--uninstall-nodist_includesHEADERS: |
| 249 |
-+uninstall-nodist_includeHEADERS: |
| 250 |
-@@ -378 +377 @@ uninstall-nodist_includesHEADERS: |
| 251 |
-- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ |
| 252 |
-+ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ |
| 253 |
-@@ -380 +379 @@ uninstall-nodist_includesHEADERS: |
| 254 |
-- dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir) |
| 255 |
-+ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) |
| 256 |
-@@ -468 +467 @@ installdirs: |
| 257 |
-- for dir in "$(DESTDIR)$(includesdir)"; do \ |
| 258 |
-+ for dir in "$(DESTDIR)$(includedir)"; do \ |
| 259 |
-@@ -522 +521 @@ info-am: |
| 260 |
--install-data-am: install-nodist_includesHEADERS |
| 261 |
-+install-data-am: install-nodist_includeHEADERS |
| 262 |
-@@ -566 +565 @@ ps-am: |
| 263 |
--uninstall-am: uninstall-nodist_includesHEADERS |
| 264 |
-+uninstall-am: uninstall-nodist_includeHEADERS |
| 265 |
-@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS |
| 266 |
-- install-nodist_includesHEADERS install-pdf install-pdf-am \ |
| 267 |
-+ install-nodist_includeHEADERS install-pdf install-pdf-am \ |
| 268 |
-@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS |
| 269 |
-- uninstall-am uninstall-nodist_includesHEADERS |
| 270 |
-+ uninstall-am uninstall-nodist_includeHEADERS |
| 271 |
|
| 272 |
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 |
| 273 |
deleted file mode 100644 |
| 274 |
index e1269b2398a..00000000000 |
| 275 |
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch |
| 276 |
+++ /dev/null |
| 277 |
@@ -1,39 +0,0 @@ |
| 278 |
-https://bugs.gentoo.org/643582 |
| 279 |
- |
| 280 |
-From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001 |
| 281 |
-From: Yen Chi Hsuan <yan12125@×××××.com> |
| 282 |
-Date: Sun, 13 Nov 2016 19:17:19 +0800 |
| 283 |
-Subject: [PATCH] Install public headers in the standard path |
| 284 |
- |
| 285 |
---- |
| 286 |
- include/Makefile.am | 3 +-- |
| 287 |
- libffi.pc.in | 2 +- |
| 288 |
- 2 files changed, 2 insertions(+), 3 deletions(-) |
| 289 |
- |
| 290 |
-diff --git a/include/Makefile.am b/include/Makefile.am |
| 291 |
-index bb241e8..c59df9f 100644 |
| 292 |
---- a/include/Makefile.am |
| 293 |
-+++ b/include/Makefile.am |
| 294 |
-@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h |
| 295 |
- noinst_HEADERS=ffi_common.h ffi_cfi.h |
| 296 |
- EXTRA_DIST=ffi.h.in |
| 297 |
- |
| 298 |
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include |
| 299 |
--nodist_includes_HEADERS = ffi.h ffitarget.h |
| 300 |
-+nodist_include_HEADERS = ffi.h ffitarget.h |
| 301 |
-diff --git a/libffi.pc.in b/libffi.pc.in |
| 302 |
-index edf6fde..6fad83b 100644 |
| 303 |
---- a/libffi.pc.in |
| 304 |
-+++ b/libffi.pc.in |
| 305 |
-@@ -2,7 +2,7 @@ prefix=@prefix@ |
| 306 |
- exec_prefix=@exec_prefix@ |
| 307 |
- libdir=@libdir@ |
| 308 |
- toolexeclibdir=@toolexeclibdir@ |
| 309 |
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include |
| 310 |
-+includedir=@includedir@ |
| 311 |
- |
| 312 |
- Name: @PACKAGE_NAME@ |
| 313 |
- Description: Library supporting Foreign Function Interfaces |
| 314 |
--- |
| 315 |
-2.15.1 |
| 316 |
- |
| 317 |
|
| 318 |
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 |
| 319 |
deleted file mode 100644 |
| 320 |
index 7c011d2b6d0..00000000000 |
| 321 |
--- a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch |
| 322 |
+++ /dev/null |
| 323 |
@@ -1,31 +0,0 @@ |
| 324 |
-https://github.com/libffi/libffi/commit/e169ba2b83c780058fe626856cfdb5903a85cb97.patch |
| 325 |
-https://bugs.gentoo.org/694916 |
| 326 |
- |
| 327 |
-From e169ba2b83c780058fe626856cfdb5903a85cb97 Mon Sep 17 00:00:00 2001 |
| 328 |
-From: Kylie McClain <somasis@×××××××.org> |
| 329 |
-Date: Fri, 29 Apr 2016 21:04:07 -0400 |
| 330 |
-Subject: [PATCH] Fix usage on musl libc |
| 331 |
- |
| 332 |
-A gcc compiled on musl does not define __gnu_linux__, it defines __linux__. |
| 333 |
-Only on glibc does __gnu_linux__ get defined, but both define __linux__, so |
| 334 |
-we should check for that instead. |
| 335 |
- |
| 336 |
-With this patch, libffi works perfectly, and passes its testsuite entirely |
| 337 |
-on musl libc systems. |
| 338 |
---- |
| 339 |
- src/closures.c | 2 +- |
| 340 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 341 |
- |
| 342 |
-diff --git a/src/closures.c b/src/closures.c |
| 343 |
-index 3dec0e31..05849e06 100644 |
| 344 |
---- a/src/closures.c |
| 345 |
-+++ b/src/closures.c |
| 346 |
-@@ -35,7 +35,7 @@ |
| 347 |
- #include <ffi_common.h> |
| 348 |
- |
| 349 |
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE |
| 350 |
--# if __gnu_linux__ && !defined(__ANDROID__) |
| 351 |
-+# if __linux__ && !defined(__ANDROID__) |
| 352 |
- /* This macro indicates it may be forbidden to map anonymous memory |
| 353 |
- with both write and execute permission. Code compiled when this |
| 354 |
- option is defined will attempt to map such pages once, but if it |
| 355 |
|
| 356 |
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 |
| 357 |
deleted file mode 100644 |
| 358 |
index c6286f34990..00000000000 |
| 359 |
--- a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch |
| 360 |
+++ /dev/null |
| 361 |
@@ -1,93 +0,0 @@ |
| 362 |
-From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001 |
| 363 |
-From: Sergei Trofimovich <slyfox@g.o> |
| 364 |
-Date: Sat, 19 May 2018 10:49:07 +0100 |
| 365 |
-Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section |
| 366 |
- |
| 367 |
-Before the change hand-crafted .eh_frame section contained |
| 368 |
-ABS relocation and caused TEXTREL tag to be emitted: |
| 369 |
- |
| 370 |
-``` |
| 371 |
-$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text |
| 372 |
-$ make |
| 373 |
-... |
| 374 |
-/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld: |
| 375 |
- read-only segment has dynamic relocations. |
| 376 |
-``` |
| 377 |
- |
| 378 |
-Link failure is caused by absolute address of FDEs |
| 379 |
-encoded into .eh_frame entries. |
| 380 |
- |
| 381 |
-Fixed TEXTREL by using pcrel (instead of ABS) encoding |
| 382 |
-for absolute addresses (__PIC__ code) by adding augmentation |
| 383 |
-information ("zR" CIE type). |
| 384 |
- |
| 385 |
-All tests still pass on hppa2.0. The specific tests that still pass |
| 386 |
-and exercise this code path: |
| 387 |
- testsuite/libffi.call/unwindtest.cc |
| 388 |
- testsuite/libffi.call/unwindtest_ffi_call.cc |
| 389 |
- |
| 390 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 391 |
---- |
| 392 |
- src/pa/linux.S | 25 +++++++++++++++++++++++-- |
| 393 |
- 1 file changed, 23 insertions(+), 2 deletions(-) |
| 394 |
- |
| 395 |
-diff --git a/src/pa/linux.S b/src/pa/linux.S |
| 396 |
-index f11ae76..ab04c75 100644 |
| 397 |
---- a/src/pa/linux.S |
| 398 |
-+++ b/src/pa/linux.S |
| 399 |
-@@ -297,10 +297,18 @@ ffi_closure_pa32: |
| 400 |
- .LSCIE1: |
| 401 |
- .word 0x0 ;# CIE Identifier Tag |
| 402 |
- .byte 0x1 ;# CIE Version |
| 403 |
-+#ifdef __PIC__ |
| 404 |
-+ .ascii "zR\0" ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data |
| 405 |
-+#else |
| 406 |
- .ascii "\0" ;# CIE Augmentation |
| 407 |
-+#endif |
| 408 |
- .uleb128 0x1 ;# CIE Code Alignment Factor |
| 409 |
- .sleb128 4 ;# CIE Data Alignment Factor |
| 410 |
- .byte 0x2 ;# CIE RA Column |
| 411 |
-+#ifdef __PIC__ |
| 412 |
-+ .uleb128 0x1 ;# Augmentation size |
| 413 |
-+ .byte 0x1b ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4) |
| 414 |
-+#endif |
| 415 |
- .byte 0xc ;# DW_CFA_def_cfa |
| 416 |
- .uleb128 0x1e |
| 417 |
- .uleb128 0x0 |
| 418 |
-@@ -310,9 +318,15 @@ ffi_closure_pa32: |
| 419 |
- .word .LEFDE1-.LASFDE1 ;# FDE Length |
| 420 |
- .LASFDE1: |
| 421 |
- .word .LASFDE1-.Lframe1 ;# FDE CIE offset |
| 422 |
-- .word .LFB1 ;# FDE initial location |
| 423 |
-+#ifdef __PIC__ |
| 424 |
-+ .word .LFB1-. ;# FDE initial location |
| 425 |
-+#else |
| 426 |
-+ .word .LFB1 ;# FDE initial location |
| 427 |
-+#endif |
| 428 |
- .word .LFE1-.LFB1 ;# FDE address range |
| 429 |
-- |
| 430 |
-+#ifdef __PIC__ |
| 431 |
-+ .uleb128 0x0 ;# Augmentation size: no data |
| 432 |
-+#endif |
| 433 |
- .byte 0x4 ;# DW_CFA_advance_loc4 |
| 434 |
- .word .LCFI11-.LFB1 |
| 435 |
- .byte 0x83 ;# DW_CFA_offset, column 0x3 |
| 436 |
-@@ -338,8 +352,15 @@ ffi_closure_pa32: |
| 437 |
- .word .LEFDE2-.LASFDE2 ;# FDE Length |
| 438 |
- .LASFDE2: |
| 439 |
- .word .LASFDE2-.Lframe1 ;# FDE CIE offset |
| 440 |
-+#ifdef __PIC__ |
| 441 |
-+ .word .LFB2-. ;# FDE initial location |
| 442 |
-+#else |
| 443 |
- .word .LFB2 ;# FDE initial location |
| 444 |
-+#endif |
| 445 |
- .word .LFE2-.LFB2 ;# FDE address range |
| 446 |
-+#ifdef __PIC__ |
| 447 |
-+ .uleb128 0x0 ;# Augmentation size: no data |
| 448 |
-+#endif |
| 449 |
- .byte 0x4 ;# DW_CFA_advance_loc4 |
| 450 |
- .word .LCFI21-.LFB2 |
| 451 |
- .byte 0x83 ;# DW_CFA_offset, column 0x3 |
| 452 |
--- |
| 453 |
-2.19.0 |
| 454 |
- |
Archives