[Spice-commits] Makefile.am

[GitLab Mirror]

 Makefile.am |   27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

New commits:
commit 25ef04cc9aff7b65689d254ed03d819c8f266810
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri May 25 14:06:00 2018 +0100

    Revert "Enable some security options on output executables"
    
    This reverts commit 5d5a268d94c5ba32cb134bea9ce6039ec7e66f37.
    
    Committed by mistake

diff --git a/Makefile.am b/Makefile.am
index 3556681..62640f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,31 +20,11 @@ endif
 # -lversion is needed for the GetFileVersion* API which is used by vdlog.cpp
 LIBS = -lversion
 
-# binutils does not take into account entry point when
-# -pie is used so we need to provide it manually
-ENTRY_PREFIX := $(if $(filter x86_64,$(host_cpu)),,_)
-
-# --dynamicbase to enable ASLR protection
-# --nxcompat is to enable NX protection
-# --pie as --dynamicbase requires relocations
-LDFLAGS_SECURITY_COMMON = \
-	-Wl,--dynamicbase -Wl,-pie \
-	-Wl,--nxcompat \
-	$(NULL)
-LDFLAGS_SECURITY_GUI = $(LDFLAGS_SECURITY_COMMON) \
-	-Wl,-e,$(ENTRY_PREFIX)WinMainCRTStartup \
-	-mwindows \
-	$(NULL)
-LDFLAGS_SECURITY_CUI = $(LDFLAGS_SECURITY_COMMON) \
-	-Wl,-e,$(ENTRY_PREFIX)mainCRTStartup \
-	-mconsole \
-	$(NULL)
-
 bin_PROGRAMS = vdagent vdservice
 
 vdagent_LDADD = $(LIBPNG_LIBS) $(ZLIB_LIBS) -lwtsapi32 -lgdi32 vdagent_rc.$(OBJEXT)
 vdagent_CXXFLAGS = $(AM_CXXFLAGS) $(LIBPNG_CFLAGS)
-vdagent_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_SECURITY_GUI)
+vdagent_LDFLAGS = $(AM_LDFLAGS) -Wl,--subsystem,windows
 vdagent_SOURCES =			\
 	common/vdcommon.cpp             \
 	common/vdcommon.h		\
@@ -73,7 +53,6 @@ vdagent_rc.$(OBJEXT): vdagent/vdagent.rc
 MAINTAINERCLEANFILES += vdagent_rc.$(OBJEXT)
 
 vdservice_LDADD = -lwtsapi32 vdservice_rc.$(OBJEXT)
-vdservice_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_SECURITY_CUI)
 vdservice_SOURCES =			\
 	common/stdint.h			\
 	common/vdcommon.cpp             \
@@ -92,7 +71,7 @@ check_PROGRAMS = imagetest
 
 imagetest_LDADD = $(LIBPNG_LIBS) $(ZLIB_LIBS) -lwtsapi32 -lgdi32
 imagetest_CXXFLAGS = $(AM_CXXFLAGS) $(LIBPNG_CFLAGS)
-imagetest_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_SECURITY_CUI)
+imagetest_LDFLAGS = $(AM_LDFLAGS) -Wl,--subsystem,console
 imagetest_SOURCES =			\
 	common/vdcommon.cpp             \
 	common/vdcommon.h		\
@@ -112,7 +91,7 @@ check_PROGRAMS += test-log-win
 TESTS += test-log
 EXTRA_DIST += test-log
 
-test_log_win_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_SECURITY_CUI)
+test_log_win_LDFLAGS = $(AM_LDFLAGS) -Wl,--subsystem,console
 test_log_win_SOURCES =			\
 	common/vdcommon.cpp             \
 	common/vdcommon.h		\