[LibOS,Pal] Consolidate common CFLAGS in Makefile.configs

LibOS/shim/src/Makefile

@@ -4,7 +4,7 @@ include ../../../Scripts/Makefile.configs
 
 OMIT_FRAME_POINTER = no
 
-CFLAGS += -Wall -fPIC -std=c11 -Winline -Wwrite-strings \
+CFLAGS += -fPIC -Winline -Wwrite-strings \
 	  -fmerge-all-constants -Wstrict-prototypes -Wtrampolines \
 	  -Werror=implicit-function-declaration \
 	  $(cc-option, -Wnull-dereference) \
@@ -12,9 +12,7 @@ CFLAGS += -Wall -fPIC -std=c11 -Winline -Wwrite-strings \
 	  -I../include -I../../../Pal/lib -I../../../Pal/include/pal \
 	  -I../../../Pal/include/elf
 
-EXTRAFLAGS = -Wextra
-
-CFLAGS += $(EXTRAFLAGS)
+CFLAGS += -Wextra
 
 ifeq ($(OMIT_FRAME_POINTER),yes)
 CFLAGS += -DOMIT_FRAME_POINTER=1

Pal/regression/Makefile

@@ -1,7 +1,7 @@
 include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 
-CFLAGS	+= -Wall -O2 -std=c11 -fno-builtin -nostdlib \
+CFLAGS	+= -fno-builtin -nostdlib \
 	  -I../include/pal -I../lib -I../src
 
 preloads = \

Pal/src/host/Linux-SGX/Makefile.am

@@ -1,11 +1,9 @@
 # Add host-specific compilation rules here
 
-CFLAGS += -Wall -fPIC -O2 -maes -std=c11 -U_FORTIFY_SOURCE \
+CFLAGS += -fPIC -maes -U_FORTIFY_SOURCE \
 	  -fno-stack-protector -fno-builtin -Wtrampolines
 
-EXTRAFLAGS = -Wextra $(call cc-option,-Wnull-dereference)
-
-CFLAGS += $(EXTRAFLAGS)
+CFLAGS += -Wextra $(call cc-option,-Wnull-dereference)
 
 ASFLAGS += -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack \
 	  -x assembler-with-cpp

Pal/src/host/Linux/Makefile.am

@@ -1,12 +1,10 @@
 # Add host-specific compilation rules here
 SEC_DIR = security/$(PAL_HOST)
 
-CFLAGS	+= -Wall -fPIC -O2 -std=c11 -U_FORTIFY_SOURCE \
+CFLAGS += -fPIC -U_FORTIFY_SOURCE \
 	  -fno-stack-protector -fno-builtin -Wtrampolines
 
-EXTRAFLAGS = -Wextra $(call cc-option,-Wnull-dereference)
-
-CFLAGS += $(EXTRAFLAGS)
+CFLAGS += -Wextra $(call cc-option,-Wnull-dereference)
 
 ASFLAGS += -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack \
 	  -x assembler-with-cpp

Pal/src/host/Skeleton/Makefile.am

@@ -1,6 +1,6 @@
 # Add host-specific compilation rules here
 
-CFLAGS += -Wall -fPIC -O2 -std=c11 -U_FORTIFY_SOURCE \
+CFLAGS += -fPIC -U_FORTIFY_SOURCE \
          -fno-stack-protector -fno-builtin
 
 CFLAGS += -Wextra -Wno-unused-parameter -Wno-sign-compare $(call cc-option,-Wnull-dereference)

Pal/test/Makefile

@@ -1,7 +1,7 @@
 include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 
-CFLAGS += -Wall -O2 -std=c11 -fno-builtin -nostdlib -no-pie \
+CFLAGS += -fno-builtin -nostdlib -no-pie \
 	  -I../include/pal -I../lib
 
 .PHONY: default

Scripts/Makefile.Test

@@ -9,9 +9,10 @@ include $(SCRIPTS_DIR)/Makefile.configs
 include $(SCRIPTS_DIR)/Makefile.rules
 include $(SCRIPTS_DIR)/Makefile.manifest
 
-CFLAGS += -Wall -std=gnu99
-CXXFLAGS += -Wall -std=c++14
-LDFLAGS	+=
+CFLAGS += -std=gnu99
+
+# TODO: enable -Wunused-result
+CFLAGS += -Wno-unused-result
 
 CFLAGS-libos = -I$(SHIMDIR)/include -L$(SHIMDIR)/../glibc-build/libos
 

Scripts/Makefile.configs

@@ -26,6 +26,9 @@ export SYS
 DEBUG ?=
 export DEBUG
 
+CFLAGS += -Wall -std=c11
+CXXFLAGS += -Wall -std=c++14
+
 ifeq ($(DEBUG),1)
 CFLAGS += -gdwarf-2 -g3
 CXXFLAGS += -gdwarf-2 -g3
@@ -33,6 +36,11 @@ CFLAGS += -DDEBUG
 ASFLAGS += -DDEBUG
 endif
 
+ifeq ($(DEBUG),)
+CFLAGS += -O2
+CXXFLAGS += -O2
+endif
+
 ifeq ($(WERROR),1)
 CFLAGS += -Werror
 CXXFLAGS += -Werror