X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Flibffi%2F0004-Add-missing-GNU-stack-markings-in-win32.S.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Flibffi%2F0004-Add-missing-GNU-stack-markings-in-win32.S.patch;h=6097287a0d7bb04762c8e18b96d82b4eececd699;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git 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 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 +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 +--- + 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 +