The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...

[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / libffi / 0004-Add-missing-GNU-stack-markings-in-win32.S.patch

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/libffi/0004-Add-missing-GNU-stack-markings-in-win32.S.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/libffi/0004-Add-missing-GNU-stack-markings-in-win32.S.patch
new file mode 100644 (file)
index 0000000..6097287
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/libffi/0004-Add-missing-GNU-stack-markings-in-win32.S.patch
@@ -0,0 +1,36 @@
+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
+