From f4602b266372995995f6b7ccfc728f49643ae2ab Mon Sep 17 00:00:00 2001 From: Charlie Gracie Date: Thu, 23 Nov 2017 16:51:14 -0500 Subject: [PATCH] Modify makefile rules for zOS Currently the OMR zOS makefiles require that a user sets a few evnironment variables that control the placement of compile options. This change uses the default placement of compile options so that the environment variables are not required. Remove the LIST option since we do not need to generate the assembly listing to stdout. This change also removes the -g9 option that was added for generating debug information since it is not valid. [ci skip] - on zOS changes Signed-off-by: Charlie Gracie --- omrmakefiles/rules.zos.mk | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/omrmakefiles/rules.zos.mk b/omrmakefiles/rules.zos.mk index 7f29614d9e9..fd243d6ec95 100644 --- a/omrmakefiles/rules.zos.mk +++ b/omrmakefiles/rules.zos.mk @@ -36,7 +36,6 @@ endif # Enable Debugging Symbols ifeq ($(OMR_DEBUG),1) - GLOBAL_FLAGS+=-Wc,g9 endif # Enable Optimizations @@ -70,9 +69,7 @@ GLOBAL_CPPFLAGS+=-DJ9ZOS390 -DLONGLONG -DJ9VM_TIERED_CODE_CACHE -D_ALL_SOURCE -D # a,goff Assemble into GOFF object files # NOANSIALIAS Do not generate ALIAS binder control statements # TARGET Generate code for the target operating system -# list Generate assembly listing -# offset In assembly listing, show addresses as offsets of function entry points -GLOBAL_FLAGS+=-Wc,xplink,convlit\(ISO8859-1\),rostring,FLOAT\(IEEE,FOLD,AFP\),enum\(4\) -Wa,goff -Wc,NOANSIALIAS -Wc,TARGET\(zOSV1R13\) -W "c,list,offset" +GLOBAL_FLAGS+=-Wc,xplink,convlit\(ISO8859-1\),rostring,FLOAT\(IEEE,FOLD,AFP\),enum\(4\) -Wa,goff -Wc,NOANSIALIAS -Wc,TARGET\(zOSV1R13\) ifeq (1,$(OMR_ENV_DATA64)) GLOBAL_CPPFLAGS+=-DJ9ZOS39064 @@ -115,17 +112,6 @@ ifeq (1,$(DO_LINK)) endif endif - -# compilation for C files. -define COMPILE_C_COMMAND -$(CC) $(CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_CPPFLAGS) $(GLOBAL_CFLAGS) $(MODULE_CFLAGS) $(CFLAGS) -c $< -o $@ > $*.asmlist -endef - -# compilation for C++ files. -define COMPILE_CXX_COMMAND -$(CXX) $(CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_CPPFLAGS) $(GLOBAL_CXXFLAGS) $(MODULE_CXXFLAGS) $(CXXFLAGS) -c $< -o $@ > $*.asmlist -endef - # compilation for metal-C files. ifeq (1,$(OMR_ENV_DATA64)) MCFLAGS=-q64