Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.make @ 9430:147162b27799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GRAAL-234 - PTX code loading
author Morris Meyer <morris.meyer@oracle.com>
date Tue, 30 Apr 2013 08:17:55 -0400
parents 0f3fe35513a0
children 836a62f43af9
comparison
equal deleted inserted replaced
9429:aaf8798b0969 9430:147162b27799
126 LFLAGS += -Xlinker -z -Xlinker noexecstack 126 LFLAGS += -Xlinker -z -Xlinker noexecstack
127 endif 127 endif
128 128
129 LIBS += -lm -pthread 129 LIBS += -lm -pthread
130 130
131 ifeq ($(OS_VENDOR),Darwin)
132 LIBS += -framework ApplicationServices -framework IOKit
133 endif
134
131 # By default, link the *.o into the library, not the executable. 135 # By default, link the *.o into the library, not the executable.
132 LINK_INTO$(LINK_INTO) = LIBJVM 136 LINK_INTO$(LINK_INTO) = LIBJVM
133 137
134 JDK_LIBDIR = $(JAVA_HOME)/jre/lib 138 JDK_LIBDIR = $(JAVA_HOME)/jre/lib
135 139
155 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \)) 159 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
156 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm 160 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
157 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm 161 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
158 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm 162 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
159 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm 163 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
164 SOURCE_PATHS+=$(HS_COMMON_SRC)/gpu/ptx
160 165
161 ifndef JAVASE_EMBEDDED 166 ifndef JAVASE_EMBEDDED
162 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ 167 SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
163 find $(HS_ALT_SRC)/share/vm/jfr -type d; \ 168 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
164 fi) 169 fi)
177 COMPILER2_PATHS += $(GENERATED)/adfiles 182 COMPILER2_PATHS += $(GENERATED)/adfiles
178 183
179 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark 184 SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
180 185
181 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal) 186 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/graal)
187 GRAAL_PATHS += $(call altsrc,$(HS_COMMON_SRC)/gpu/ptx)
182 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal 188 GRAAL_PATHS += $(HS_COMMON_SRC)/share/vm/graal
189 GRAAL_PATHS += $(HS_COMMON_SRC)/gpu/ptx
183 190
184 # Include dirs per type. 191 # Include dirs per type.
185 Src_Dirs/CORE := $(CORE_PATHS) 192 Src_Dirs/CORE := $(CORE_PATHS)
186 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS) 193 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) $(GRAAL_PATHS)
187 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS) 194 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) $(GRAAL_PATHS)