Mercurial > hg > graal-compiler
diff make/linux/makefiles/vm.make @ 1010:354d3184f6b2
6890308: integrate zero assembler hotspot changes
Reviewed-by: never
Contributed-by: gbenson@redhat.com
| author | never |
|---|---|
| date | Tue, 13 Oct 2009 12:04:21 -0700 |
| parents | 6e76352f1f62 |
| children | 167c2986d91b |
line wrap: on
line diff
--- a/make/linux/makefiles/vm.make Wed Oct 07 15:38:37 2009 -0700 +++ b/make/linux/makefiles/vm.make Tue Oct 13 12:04:21 2009 -0700 @@ -40,7 +40,11 @@ include $(GENERATED)/Dependencies # read machine-specific adjustments (%%% should do this via buildtree.make?) -include $(MAKEFILES_DIR)/$(BUILDARCH).make +ifeq ($(ZERO_BUILD), true) + include $(MAKEFILES_DIR)/zeroshark.make +else + include $(MAKEFILES_DIR)/$(BUILDARCH).make +endif # set VPATH so make knows where to look for source files # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm @@ -124,7 +128,11 @@ rm -f $@ cat $^ > $@ -STATIC_CXX = true +ifeq ($(ZERO_LIBARCH), ppc64) + STATIC_CXX = false +else + STATIC_CXX = true +endif ifeq ($(LINK_INTO),AOUT) LIBJVM.o = @@ -148,6 +156,9 @@ LIBS_VM += $(LIBS) endif +ifeq ($(ZERO_BUILD), true) + LIBS_VM += $(LIBFFI_LIBS) +endif LINK_VM = $(LINK_LIB.c)