Mercurial > jdk8-mips64-public > hotspot / file comparison
comparison: make/linux/makefiles/vm.make
make/linux/makefiles/vm.make
- changeset 3649
- 3d7ea1dbe0de
- parent 3619
- 2d503de963b3
- child 3726
- 74c359c4a9e5
equal
deleted
inserted
replaced
| 3648:77591ef8983a | 3649:3d7ea1dbe0de |
|---|---|
| 40 | 40 |
| 41 # reads the generated files defining the set of .o's and the .o .h dependencies | 41 # reads the generated files defining the set of .o's and the .o .h dependencies |
| 42 -include $(DEP_DIR)/*.d | 42 -include $(DEP_DIR)/*.d |
| 43 | 43 |
| 44 # read machine-specific adjustments (%%% should do this via buildtree.make?) | 44 # read machine-specific adjustments (%%% should do this via buildtree.make?) |
| 45 ifeq ($(ZERO_BUILD), true) | 45 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
| 46 include $(MAKEFILES_DIR)/zeroshark.make | 46 include $(MAKEFILES_DIR)/zeroshark.make |
| 47 else | 47 else |
| 48 include $(MAKEFILES_DIR)/$(BUILDARCH).make | 48 include $(MAKEFILES_DIR)/$(BUILDARCH).make |
| 49 endif | 49 endif |
| 50 | 50 |
| 234 cat $^ > $@ | 234 cat $^ > $@ |
| 235 | 235 |
| 236 vm.def: $(Res_Files) $(Obj_Files) | 236 vm.def: $(Res_Files) $(Obj_Files) |
| 237 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ | 237 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ |
| 238 | 238 |
| 239 ifeq ($(SHARK_BUILD), true) | 239 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
| 240 STATIC_CXX = false | 240 STATIC_CXX = false |
| 241 else | 241 else |
| 242 ifeq ($(ZERO_LIBARCH), ppc64) | 242 ifeq ($(ZERO_LIBARCH), ppc64) |
| 243 STATIC_CXX = false | 243 STATIC_CXX = false |
| 244 else | 244 else |
| 266 LIBS_VM += -lstdc++ | 266 LIBS_VM += -lstdc++ |
| 267 endif | 267 endif |
| 268 | 268 |
| 269 LIBS_VM += $(LIBS) | 269 LIBS_VM += $(LIBS) |
| 270 endif | 270 endif |
| 271 ifeq ($(ZERO_BUILD), true) | 271 ifeq ($(JVM_VARIANT_ZERO), true) |
| 272 LIBS_VM += $(LIBFFI_LIBS) | 272 LIBS_VM += $(LIBFFI_LIBS) |
| 273 endif | 273 endif |
| 274 ifeq ($(SHARK_BUILD), true) | 274 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
| 275 LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) | |
| 275 LFLAGS_VM += $(LLVM_LDFLAGS) | 276 LFLAGS_VM += $(LLVM_LDFLAGS) |
| 276 LIBS_VM += $(LLVM_LIBS) | |
| 277 endif | 277 endif |
| 278 | 278 |
| 279 LINK_VM = $(LINK_LIB.CC) | 279 LINK_VM = $(LINK_LIB.CC) |
| 280 | 280 |
| 281 # rule for building precompiled header | 281 # rule for building precompiled header |
