1
diff --git a/configure.ac b/configure.ac
2
index 37cc2ae..ee52fe1 100644
5
@@ -941,6 +941,18 @@ int main(void) {
9
+AC_SUBST(EXECSTACK,"")
10
+saved_LDFLAGS="$LDFLAGS"
11
+LDFLAGS="$LDFLAGS -z execstack"
12
+AC_CACHE_CHECK([for -z execstack], ac_cv_z_execstack,
13
+ AC_TRY_LINK([],[int main(void) {return 0;}],
14
+ ac_cv_z_execstack=yes,ac_cv_z_execstack=no))
15
+if test $ac_cv_z_execstack
17
+ EXECSTACK="-z execstack"
19
+LDFLAGS="$saved_LDFLAGS"
21
dnl **** Check how to define a function in assembly code ****
23
AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,
24
diff --git a/loader/Makefile.in b/loader/Makefile.in
25
index 47a8629..2ef5dfe 100644
26
--- a/loader/Makefile.in
27
+++ b/loader/Makefile.in
28
@@ -28,18 +28,19 @@ all: $(WINE_BINARIES) $(MODULE) $(MANPAG
30
LIBPTHREAD = @LIBPTHREAD@
31
LDEXECFLAGS = @LDEXECFLAGS@
32
+EXECSTACK = @EXECSTACK@
34
wine-glibc: glibc.o Makefile.in
35
$(CC) -o $@ glibc.o $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
37
wine-preloader: preloader.o Makefile.in
38
- $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS)
39
+ $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) $(EXECSTACK)
41
wine-kthread: $(KTHREAD_OBJS) Makefile.in
42
- $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS)
43
+ $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
45
wine-pthread: $(PTHREAD_OBJS) Makefile.in
46
- $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS)
47
+ $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(EXECSTACK)
49
$(MODULE): $(MAIN_BINARY)
50
$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)