Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.make @ 4607:ee87cfe2f8f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made GraalVM build work on Mac OS X.
author Doug Simon <doug.simon@oracle.com>
date Fri, 17 Feb 2012 14:07:32 +0100
parents 436b4a3231bf
children 33df1aeaebbf
comparison
equal deleted inserted replaced
4606:ad0440b099ff 4607:ee87cfe2f8f9
116 LIBS += -lm -pthread 116 LIBS += -lm -pthread
117 117
118 # By default, link the *.o into the library, not the executable. 118 # By default, link the *.o into the library, not the executable.
119 LINK_INTO$(LINK_INTO) = LIBJVM 119 LINK_INTO$(LINK_INTO) = LIBJVM
120 120
121 JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH) 121 JDK_LIBDIR = $(JAVA_HOME)/jre/lib
122 122
123 #---------------------------------------------------------------------- 123 #----------------------------------------------------------------------
124 # jvm_db & dtrace 124 # jvm_db & dtrace
125 include $(MAKEFILES_DIR)/dtrace.make 125 include $(MAKEFILES_DIR)/dtrace.make
126 126
135 else 135 else
136 LIBJVM = lib$(JVM).so 136 LIBJVM = lib$(JVM).so
137 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so 137 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
138 endif 138 endif
139 139
140 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt 140 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal
141 141
142 SOURCE_PATHS=\ 142 SOURCE_PATHS=\
143 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ 143 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
144 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 144 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
145 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 145 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
159 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt 159 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
160 COMPILER2_PATHS += $(GENERATED)/adfiles 160 COMPILER2_PATHS += $(GENERATED)/adfiles
161 161
162 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 162 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
163 163
164 GRAAL_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
165 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/c1
166 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
167 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
168
164 # Include dirs per type. 169 # Include dirs per type.
165 Src_Dirs/CORE := $(CORE_PATHS) 170 Src_Dirs/CORE := $(CORE_PATHS)
166 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) 171 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
167 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) 172 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
168 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) 173 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
169 Src_Dirs/ZERO := $(CORE_PATHS) 174 Src_Dirs/ZERO := $(CORE_PATHS)
170 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) 175 Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
176 Src_Dirs/GRAAL := $(CORE_PATHS) $(GRAAL_PATHS)
171 Src_Dirs := $(Src_Dirs/$(TYPE)) 177 Src_Dirs := $(Src_Dirs/$(TYPE))
172 178
173 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* 179 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
174 COMPILER1_SPECIFIC_FILES := c1_\* 180 COMPILER1_SPECIFIC_FILES := c1_\*
175 SHARK_SPECIFIC_FILES := shark 181 SHARK_SPECIFIC_FILES := shark
176 ZERO_SPECIFIC_FILES := zero 182 ZERO_SPECIFIC_FILES := zero
183 GRAAL_SPECIFIC_FILES := graal
177 184
178 # Always exclude these. 185 # Always exclude these.
179 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp 186 Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
180 187
181 # Exclude per type. 188 # Exclude per type.
183 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 190 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
184 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 191 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
185 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) 192 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
186 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp 193 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
187 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) 194 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
195 Src_Files_EXCLUDE/GRAAL := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
188 196
189 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) 197 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
190 198
191 # Special handling of arch model. 199 # Special handling of arch model.
192 ifeq ($(Platform_arch_model), x86_32) 200 ifeq ($(Platform_arch_model), x86_32)