diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-08 10:46:04 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-08 11:31:56 +0100 |
| commit | 7a40a6cde92896d7de09919499c66324a2d01771 (patch) | |
| tree | 5718476e060ec44d0272a43949e749760046ad04 | |
| parent | fd3b845c01aa26b6e5cd12c00af59e5468e21b1b (diff) | |
| download | haskell-7a40a6cde92896d7de09919499c66324a2d01771.tar.gz | |
Update libffi-tarballs submodule to libffi 3.1 (re #10238)
Reviewers: bgamari, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1589
GHC Trac Issues: #10238
| m--------- | libffi-tarballs | 0 | ||||
| -rw-r--r-- | libffi/ghc.mk | 3 | ||||
| -rw-r--r-- | libffi/libffi.x86-execstack.patch | 24 |
3 files changed, 0 insertions, 27 deletions
diff --git a/libffi-tarballs b/libffi-tarballs -Subproject b6658e5d73eb0579b3054593de21f329ab491e7 +Subproject ec37a68838566cb830c33cb30bfade003a306cf diff --git a/libffi/ghc.mk b/libffi/ghc.mk index a25dbf0fe8..404cce989c 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -63,9 +63,6 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP) # will use cygwin symbolic links which cannot be read by mingw gcc. chmod +x libffi/ln - # don't report nonselinux systems as selinux - ( cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.x86-execstack.patch; ) - # We need to use -MMD rather than -MD, as otherwise we get paths # like c:/... in the dependency files on Windows, and the extra # colons break make diff --git a/libffi/libffi.x86-execstack.patch b/libffi/libffi.x86-execstack.patch deleted file mode 100644 index baea18fc27..0000000000 --- a/libffi/libffi.x86-execstack.patch +++ /dev/null @@ -1,24 +0,0 @@ - * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so.6.0.2 - * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so - * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so.6 - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_p.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_l.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_debug.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_debug.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_l.a:win32.o - * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_p.a:win32.o - -http://bugs.gentoo.org/511634 -http://sourceware.org/ml/libffi-discuss/2014/msg00058.html - ---- src/x86/win32.S -+++ src/x86/win32.S -@@ -1304,3 +1304,6 @@ - - #endif /* !_MSC_VER */ - -+#if defined __ELF__ && defined __linux__ -+ .section .note.GNU-stack,"",@progbits -+#endif |