fix exec stack problem on aarch64 build

This commit is contained in:
Anthony Green 2017-06-20 09:16:11 -04:00
parent 2455877bfe
commit 4fc6914d07
2 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- a/src/aarch64/sysv.S
+++ b/src/aarch64/sysv.S
@@ -396,3 +396,8 @@
#ifdef __ELF__
.size CNAME(ffi_closure_SYSV), .-CNAME(ffi_closure_SYSV)
#endif
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",%progbits
+#endif
+

View File

@ -2,7 +2,7 @@
Name: libffi Name: libffi
Version: 3.1 Version: 3.1
Release: 10%{?dist} Release: 11%{?dist}
Summary: A portable foreign function interface library Summary: A portable foreign function interface library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -14,6 +14,7 @@ Source2: ffitarget-multilib.h
Patch0: libffi-3.1-fix-include-path.patch Patch0: libffi-3.1-fix-include-path.patch
Patch1: libffi-3.1-fix-exec-stack.patch Patch1: libffi-3.1-fix-exec-stack.patch
Patch2: libffi-aarch64-rhbz1174037.patch Patch2: libffi-aarch64-rhbz1174037.patch
Patch3: libffi-3.1-aarch64-fix-exec-stack.patch
%description %description
Compilers for high level languages generate code that follow certain Compilers for high level languages generate code that follow certain
@ -47,7 +48,7 @@ between the two languages.
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
@ -61,6 +62,7 @@ developing applications that use %{name}.
%patch0 -p1 -b .fixpath %patch0 -p1 -b .fixpath
%patch1 -p1 -b .execstack %patch1 -p1 -b .execstack
%patch2 -p1 -b .aarch64 %patch2 -p1 -b .aarch64
%patch3 -p1 -b .aarch64execstack
%build %build
@ -122,6 +124,9 @@ fi
%{_infodir}/libffi.info.gz %{_infodir}/libffi.info.gz
%changelog %changelog
* Tue Jun 20 2017 Anthony Green <green@redhat.com> - 3.1-11
- fix exec stack problem on aarch64 build
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-10 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild