5f1fa660ea
Status of the patches: - libffi-001-Fix-installation-location-of-libffi.patch, preserved. - libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch, preserved - libffi-arc-01-Add-ARC-support.patch, removed, ARC support was merged upstream as of commit b082e15091961373c03d10ed0251f619ebb6ed76. - libffi-arc-02-Rebuild-for-ARC-additions.patch, removed, this patch was merged upstream as of commit 0f8690a84c874ec09a090c8c6adfb93c594acac6. - libffi-003-fix-typo.patch, added, reported on the upstream mailing list as being necessary, will be part of the next 3.1.1 release. - libffi-004-Add-missing-GNU-stack-markings-in-win32.S.patch, same status as patch 003. - libffi-005-Fix-paths-in-libffi.pc.in.patch, same status as patch 003. The 3.1 release adds support for a number of architectures: ARC support, ppc64le support, NIOS II support. See https://sourceware.org/ml/libffi-announce/2014/msg00000.html for details. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001
|
|
From: Samuli Suominen <ssuominen@gentoo.org>
|
|
Date: Sat, 31 May 2014 08:53:10 -0400
|
|
Subject: [PATCH 06/10] Add missing GNU stack markings in win32.S
|
|
|
|
This patch was borrowed from upstream, commit
|
|
978c9540154d320525488db1b7049277122f736d, and will be part of the next
|
|
3.1.1 release.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
src/x86/win32.S | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/x86/win32.S b/src/x86/win32.S
|
|
index daf0e79..e42baf2 100644
|
|
--- a/src/x86/win32.S
|
|
+++ b/src/x86/win32.S
|
|
@@ -1,5 +1,6 @@
|
|
/* -----------------------------------------------------------------------
|
|
- win32.S - Copyright (c) 1996, 1998, 2001, 2002, 2009 Red Hat, Inc.
|
|
+ win32.S - Copyright (c) 2014 Anthony Green
|
|
+ Copyright (c) 1996, 1998, 2001, 2002, 2009 Red Hat, Inc.
|
|
Copyright (c) 2001 John Beniton
|
|
Copyright (c) 2002 Ranjit Mathew
|
|
Copyright (c) 2009 Daniel Witte
|
|
@@ -1304,3 +1305,6 @@ L_ffi_closure_SYSV_inner$stub:
|
|
|
|
#endif /* !_MSC_VER */
|
|
|
|
+#if defined __ELF__ && defined __linux__
|
|
+ .section .note.GNU-stack,"",@progbits
|
|
+#endif
|
|
--
|
|
2.0.0
|
|
|