Skip to content

Commit

Permalink
Merge pull request eclipse-omr#2053 from charliegracie/zos
Browse files Browse the repository at this point in the history
Modify makefile rules for zOS
  • Loading branch information
youngar authored Nov 27, 2017
2 parents 1a3f874 + f4602b2 commit 92e9349
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions omrmakefiles/rules.zos.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ endif

# Enable Debugging Symbols
ifeq ($(OMR_DEBUG),1)
GLOBAL_FLAGS+=-Wc,g9
endif

# Enable Optimizations
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 92e9349

Please sign in to comment.