< prev index next >

make/RunTestsPrebuilt.gmk

Print this page

        

*** 93,108 **** # Create an ephemeral spec file # # $1: The output file name # $2..$N: The lines to output to the file define CreateNewSpec ! $(if $(strip $(30)), \ $(error Internal makefile error: \ Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \ ) \ $(shell $(RM) $1) \ ! $(foreach i, $(call sequence, 2, 29), \ $(if $(strip $($i)), \ $(call AppendFile, $(strip $($i)), $1) \ ) \ ) endef --- 93,108 ---- # Create an ephemeral spec file # # $1: The output file name # $2..$N: The lines to output to the file define CreateNewSpec ! $(if $(strip $(31)), \ $(error Internal makefile error: \ Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \ ) \ $(shell $(RM) $1) \ ! $(foreach i, $(call sequence, 2, 30), \ $(if $(strip $($i)), \ $(call AppendFile, $(strip $($i)), $1) \ ) \ ) endef
*** 218,241 **** else FIXPATH := PATH_SEP:=: endif ! # Check number of cores ifeq ($(OPENJDK_TARGET_OS), linux) NUM_CORES := $(shell $(CAT) /proc/cpuinfo | $(GREP) -c processor) else ifeq ($(OPENJDK_TARGET_OS), macosx) NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) else ifeq ($(OPENJDK_TARGET_OS), solaris) NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line) else ifeq ($(OPENJDK_TARGET_OS), windows) NUM_CORES := $(NUMBER_OF_PROCESSORS) endif ifeq ($(NUM_CORES), ) $(warn Could not find number of CPUs, assuming 1) NUM_CORES := 1 endif # Setup LD for AOT support ifneq ($(DEVKIT_HOME), ) ifeq ($(OPENJDK_TARGET_OS), windows) LD := $(DEVKIT_HOME)/VC/bin/x64/link --- 218,256 ---- else FIXPATH := PATH_SEP:=: endif ! # Check number of cores and memory in MB ifeq ($(OPENJDK_TARGET_OS), linux) NUM_CORES := $(shell $(CAT) /proc/cpuinfo | $(GREP) -c processor) + MEMORY_SIZE := $(shell \ + $(EXPR) `$(CAT) /proc/meminfo | $(GREP) MemTotal | $(AWK) '{print $$2}'` / 1024 \ + ) else ifeq ($(OPENJDK_TARGET_OS), macosx) NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) + MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024) else ifeq ($(OPENJDK_TARGET_OS), solaris) NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line) + MEMORY_SIZE := $(shell \ + /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \ + ) else ifeq ($(OPENJDK_TARGET_OS), windows) NUM_CORES := $(NUMBER_OF_PROCESSORS) + MEMORY_SIZE := $(shell \ + $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \ + | $(CUT) -d "=" -f 2-` / 1024 / 1024 \ + ) endif ifeq ($(NUM_CORES), ) $(warn Could not find number of CPUs, assuming 1) NUM_CORES := 1 endif + ifeq ($(MEMORY_SIZE), ) + $(warn Could not find memory size, assuming 1024 MB) + MEMORY_SIZE := 1024 + endif # Setup LD for AOT support ifneq ($(DEVKIT_HOME), ) ifeq ($(OPENJDK_TARGET_OS), windows) LD := $(DEVKIT_HOME)/VC/bin/x64/link
*** 296,305 **** --- 311,321 ---- OPENJDK_TARGET_CPU := $(OPENJDK_TARGET_CPU), \ OPENJDK_TARGET_CPU_ARCH := $(OPENJDK_TARGET_CPU_ARCH), \ OPENJDK_TARGET_CPU_BITS := $(OPENJDK_TARGET_CPU_BITS), \ OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \ NUM_CORES := $(NUM_CORES), \ + MEMORY_SIZE := $(MEMORY_SIZE), \ LD := $(LD), \ LIBRARY_PREFIX := $(LIBRARY_PREFIX), \ SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \ EXE_SUFFIX := $(EXE_SUFFIX), \ include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
< prev index next >