1.1 --- a/make/linux/makefiles/vm.make Wed Oct 07 15:38:37 2009 -0700
1.2 +++ b/make/linux/makefiles/vm.make Tue Oct 13 12:04:21 2009 -0700
1.3 @@ -40,7 +40,11 @@
1.4 include $(GENERATED)/Dependencies
1.5
1.6 # read machine-specific adjustments (%%% should do this via buildtree.make?)
1.7 -include $(MAKEFILES_DIR)/$(BUILDARCH).make
1.8 +ifeq ($(ZERO_BUILD), true)
1.9 + include $(MAKEFILES_DIR)/zeroshark.make
1.10 +else
1.11 + include $(MAKEFILES_DIR)/$(BUILDARCH).make
1.12 +endif
1.13
1.14 # set VPATH so make knows where to look for source files
1.15 # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
1.16 @@ -124,7 +128,11 @@
1.17 rm -f $@
1.18 cat $^ > $@
1.19
1.20 -STATIC_CXX = true
1.21 +ifeq ($(ZERO_LIBARCH), ppc64)
1.22 + STATIC_CXX = false
1.23 +else
1.24 + STATIC_CXX = true
1.25 +endif
1.26
1.27 ifeq ($(LINK_INTO),AOUT)
1.28 LIBJVM.o =
1.29 @@ -148,6 +156,9 @@
1.30
1.31 LIBS_VM += $(LIBS)
1.32 endif
1.33 +ifeq ($(ZERO_BUILD), true)
1.34 + LIBS_VM += $(LIBFFI_LIBS)
1.35 +endif
1.36
1.37 LINK_VM = $(LINK_LIB.c)
1.38
