Mercurial > hg > truffle

comparison make/windows/makefiles/adlc.make @ 4891:719f7007c8e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141242: build-infra merge: Rename CPP->CXX and LINK->LD Summary: Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker. Reviewed-by: dholmes, ohrstrom
author erikj
date Mon, 06 Feb 2012 09:14:22 +0100
parents 65149e74c706
children b9a9ed0f8eeb
comparison
equal deleted inserted replaced
4890:c77d473e71f7 4891:719f7007c8e8
43 ADLCFLAGS=-q -T -D_LP64 43 ADLCFLAGS=-q -T -D_LP64
44 !else 44 !else
45 ADLCFLAGS=-q -T -U_LP64 45 ADLCFLAGS=-q -T -U_LP64
46 !endif 46 !endif
47 47
48 ADLC_CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 48 ADLC_CXX_FLAGS=$(CXX_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
49 49
50 CPP_INCLUDE_DIRS=\ 50 CXX_INCLUDE_DIRS=\
51 /I "..\generated" \ 51 /I "..\generated" \
52 /I "$(WorkSpace)\src\share\vm" \ 52 /I "$(WorkSpace)\src\share\vm" \
53 /I "$(WorkSpace)\src\os\windows\vm" \ 53 /I "$(WorkSpace)\src\os\windows\vm" \
54 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 54 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
55 55
92 $(AdlcOutDir)\ad_$(Platform_arch_model)_pipeline.cpp \ 92 $(AdlcOutDir)\ad_$(Platform_arch_model)_pipeline.cpp \
93 $(AdlcOutDir)\adGlobals_$(Platform_arch_model).hpp \ 93 $(AdlcOutDir)\adGlobals_$(Platform_arch_model).hpp \
94 $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp 94 $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
95 95
96 {$(WorkSpace)\src\share\vm\adlc}.cpp.obj:: 96 {$(WorkSpace)\src\share\vm\adlc}.cpp.obj::
97 $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 97 $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $<
98 98
99 {$(WorkSpace)\src\share\vm\opto}.cpp.obj:: 99 {$(WorkSpace)\src\share\vm\opto}.cpp.obj::
100 $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 100 $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $<
101 101
102 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \ 102 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \
103 forms.obj formsopt.obj formssel.obj opcodes.obj output_c.obj output_h.obj 103 forms.obj formsopt.obj formssel.obj opcodes.obj output_c.obj output_h.obj
104 $(LINK) $(LINK_FLAGS) /subsystem:console /out:$@ $** 104 $(LD) $(LD_FLAGS) /subsystem:console /out:$@ $**
105 !if "$(MT)" != "" 105 !if "$(MT)" != ""
106 # The previous link command created a .manifest file that we want to 106 # The previous link command created a .manifest file that we want to
107 # insert into the linked artifact so we do not need to track it 107 # insert into the linked artifact so we do not need to track it
108 # separately. Use ";#2" for .dll and ";#1" for .exe: 108 # separately. Use ";#2" for .dll and ";#1" for .exe:
109 $(MT) /manifest $@.manifest /outputresource:$@;#1 109 $(MT) /manifest $@.manifest /outputresource:$@;#1