Skip to content

Commit 7456c7a

Browse files
committed
macos/ffi: Drop the usage of executable stacks
Given the advances in security the usage of executable stacks isn't available on macos/AARCH64. Drop it.
1 parent d2f0739 commit 7456c7a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2024-03-16 Holger Hans Peter Freyther <[email protected]>
2+
3+
* configure.ac: Drop executable stacks on macos.
4+
* Makefile.am: Drop executable stacks on macos.
5+
16
2018-01-23 Mathias Laurin <[email protected]>
27

38
* doc/tutorial.texi: Fix typo in tutorial.

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ bin_PROGRAMS = gst
110110
gst_SOURCES = main.c
111111
gst_LDADD = libgst/libgst.la lib-src/library.la @ICON@
112112
gst_DEPENDENCIES = libgst/libgst.la lib-src/library.la @ICON@
113-
gst_LDFLAGS = -export-dynamic $(RELOC_LDFLAGS) $(LIBFFI_EXECUTABLE_LDFLAGS)
113+
gst_LDFLAGS = -export-dynamic $(RELOC_LDFLAGS)
114114

115115
# The single gst-tool executable is installed with multiple names, hence
116116
# we use noinst here.
117117
noinst_PROGRAMS = gst-tool
118118
gst_tool_SOURCES = gst-tool.c
119119
gst_tool_LDADD = libgst/libgst.la lib-src/library.la @ICON@
120120
gst_tool_DEPENDENCIES = libgst/libgst.la lib-src/library.la @ICON@
121-
gst_tool_LDFLAGS = -export-dynamic $(RELOC_LDFLAGS) $(LIBFFI_EXECUTABLE_LDFLAGS)
121+
gst_tool_LDFLAGS = -export-dynamic $(RELOC_LDFLAGS)
122122

123123
# Used to call the Unix zip from Wine
124124
EXTRA_PROGRAMS = winewrapper

configure.ac

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,9 @@ case $with_system_libffi in
160160
INCFFI="-I$with_system_libffi/../include"
161161
LIBFFI="-L$with_system_libffi -lffi"
162162
esac
163-
case $host in
164-
*-*-darwin[[912]]* ) LIBFFI_EXECUTABLE_LDFLAGS=-Wl,-allow_stack_execute ;;
165-
*) LIBFFI_EXECUTABLE_LDFLAGS= ;;
166-
esac
167163
AC_SUBST(INCFFI)
168164
AC_SUBST(LIBFFI)
169-
AC_SUBST(LIBFFI_EXECUTABLE_LDFLAGS)
165+
170166

171167
case $ac_configure_args in
172168
*--enable-subdir) ;;

0 commit comments

Comments
 (0)