app: fix linker warnings

jovanbulck · Sep 17, 2024 · 3fc7b46 · 3fc7b46
1 parent 26518e8
commit 3fc7b46
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/app/aep-redirect/Enclave/Makefile b/app/aep-redirect/Enclave/Makefile
@@ -31,7 +31,7 @@ OUTPUT_T          = $(ENCLAVE).so
 OUTPUT_T_UNSIG    = $(ENCLAVE).unsigned.so
 OUTPUT_U          = lib$(ENCLAVE)_proxy.a
 LIB_DIRS          = -L $(SGX_SDK)/lib$(LIB_SUFX)/
-LD_FLAGS         += -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
+LD_FLAGS         += -z noexecstack -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
                     -Wl,--whole-archive -Wl,--start-group $(ENCLAVE_LIBS) -Wl,--end-group \
                     -Wl,--no-whole-archive -Wl,--start-group $(ENCLAVE_LIB_PARTS) -Wl,--end-group \
                     -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \

diff --git a/app/aep-redirect/Makefile b/app/aep-redirect/Makefile
@@ -1,6 +1,7 @@
 LIBSGXSTEP_DIR       = ../..
 LIBSGXSTEP           = $(LIBSGXSTEP_DIR)/libsgxstep
 URTS_LIB_PATH        = $(LIBSGXSTEP_DIR)/linux-sgx/psw/urts/linux
+-include $(LIBSGXSTEP)/Makefile.config
 
 ifeq ($(SGX_SDK),)
     SGX_SDK          = /opt/intel/sgxsdk

diff --git a/app/bench/Enclave/Makefile b/app/bench/Enclave/Makefile
@@ -31,7 +31,7 @@ OUTPUT_T          = $(ENCLAVE).so
 OUTPUT_T_UNSIG    = $(ENCLAVE).unsigned.so
 OUTPUT_U          = lib$(ENCLAVE)_proxy.a
 LIB_DIRS          = -L$(SGX_SDK)/lib$(LIB_SUFX)/
-LD_FLAGS         += -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
+LD_FLAGS         += -z noexecstack -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
                     -Wl,--whole-archive -Wl,--start-group $(ENCLAVE_LIBS) -Wl,--end-group \
                     -Wl,--no-whole-archive -Wl,--start-group $(ENCLAVE_LIB_PARTS) -Wl,--end-group \
                     -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \

diff --git a/app/foreshadow/Enclave/Makefile b/app/foreshadow/Enclave/Makefile
@@ -31,7 +31,7 @@ OUTPUT_T          = $(ENCLAVE).so
 OUTPUT_T_UNSIG    = $(ENCLAVE).unsigned.so
 OUTPUT_U          = lib$(ENCLAVE)_proxy.a
 LIB_DIRS          = -L$(SGX_SDK)/lib$(LIB_SUFX)/
-LD_FLAGS         += -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
+LD_FLAGS         += -z noexecstack -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
                     -Wl,--whole-archive -Wl,--start-group $(ENCLAVE_LIBS) -Wl,--end-group \
                     -Wl,--no-whole-archive -Wl,--start-group $(ENCLAVE_LIB_PARTS) -Wl,--end-group \
                     -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \

diff --git a/app/lvi/Enclave/Makefile b/app/lvi/Enclave/Makefile
@@ -31,7 +31,7 @@ OUTPUT_T          = $(ENCLAVE).so
 OUTPUT_T_UNSIG    = $(ENCLAVE).unsigned.so
 OUTPUT_U          = lib$(ENCLAVE)_proxy.a
 LIB_DIRS          = -L $(SGX_SDK)/lib$(LIB_SUFX)/
-LD_FLAGS         += -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
+LD_FLAGS         += -z noexecstack -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
                     -Wl,--whole-archive -Wl,--start-group $(ENCLAVE_LIBS) -Wl,--end-group \
                     -Wl,--no-whole-archive -Wl,--start-group $(ENCLAVE_LIB_PARTS) -Wl,--end-group \
                     -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \

diff --git a/app/lvi/Makefile b/app/lvi/Makefile
@@ -1,6 +1,7 @@
 LIBSGXSTEP_DIR       = ../..
 LIBSGXSTEP           = $(LIBSGXSTEP_DIR)/libsgxstep
 URTS_LIB_PATH        = $(LIBSGXSTEP_DIR)/linux-sgx/psw/urts/linux
+-include $(LIBSGXSTEP)/Makefile.config
 
 ifeq ($(SGX_SDK),)
     SGX_SDK          = /opt/intel/sgxsdk

diff --git a/app/memcmp/Enclave/Makefile b/app/memcmp/Enclave/Makefile
@@ -31,7 +31,7 @@ OUTPUT_T          = $(ENCLAVE).so
 OUTPUT_T_UNSIG    = $(ENCLAVE).unsigned.so
 OUTPUT_U          = lib$(ENCLAVE)_proxy.a
 LIB_DIRS          = -L$(SGX_SDK)/lib$(LIB_SUFX)/
-LD_FLAGS         += -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
+LD_FLAGS         += -z noexecstack -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles \
                     -Wl,--whole-archive -Wl,--start-group $(ENCLAVE_LIBS) -Wl,--end-group \
                     -Wl,--no-whole-archive -Wl,--start-group $(ENCLAVE_LIB_PARTS) -Wl,--end-group \
                     -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \