equal
deleted
inserted
replaced
67 $$(info Prebuilt variable $1=$2 (default value)) |
67 $$(info Prebuilt variable $1=$2 (default value)) |
68 endif |
68 endif |
69 $1:=$2 |
69 $1:=$2 |
70 endif |
70 endif |
71 else |
71 else |
72 ifneq ($$(findstring $$(LOG), info debug trace), ) |
72 ifneq ($$(findstring $$(LOG), info debug trace), ) |
73 $$(info Prebuilt variable $1=$$($1)) |
73 $$(info Prebuilt variable $1=$$($1)) |
74 endif |
74 endif |
75 endif |
75 endif |
76 # If $1 has a value (is not optional), and $3 is not set (to NO_CHECK), |
76 # If $1 has a value (is not optional), and $3 is not set (to NO_CHECK), |
77 # and if wildcard is empty, then complain that the file is missing. |
77 # and if wildcard is empty, then complain that the file is missing. |
89 define CreateNewSpec |
89 define CreateNewSpec |
90 $(if $(strip $(26)), \ |
90 $(if $(strip $(26)), \ |
91 $(error Internal makefile error: \ |
91 $(error Internal makefile error: \ |
92 Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \ |
92 Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \ |
93 ) \ |
93 ) \ |
94 $(shell rm -f $1) \ |
94 $(shell $(RM) $1) \ |
95 $(foreach i, 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, \ |
95 $(foreach i, $(call sequence, 2, 25), \ |
96 $(if $(strip $($i)), \ |
96 $(if $(strip $($i)), \ |
97 $(call AppendFile, $(strip $($i)), $1) \ |
97 $(call AppendFile, $(strip $($i)), $1) \ |
98 ) \ |
98 ) \ |
99 ) |
99 ) |
100 endef |
100 endef |
177 OPENJDK_TARGET_CPU_ENDIAN := big |
177 OPENJDK_TARGET_CPU_ENDIAN := big |
178 else |
178 else |
179 OPENJDK_TARGET_CPU := $(UNAME_CPU) |
179 OPENJDK_TARGET_CPU := $(UNAME_CPU) |
180 endif |
180 endif |
181 else |
181 else |
182 # ... all other user uname -m |
182 # ... all others use uname -m |
183 UNAME_CPU := $(shell $(UNAME) -m) |
183 UNAME_CPU := $(shell $(UNAME) -m) |
184 ifeq ($(UNAME_CPU), i686) |
184 ifeq ($(UNAME_CPU), i686) |
185 OPENJDK_TARGET_CPU := x86 |
185 OPENJDK_TARGET_CPU := x86 |
186 OPENJDK_TARGET_CPU_BITS := 32 |
186 OPENJDK_TARGET_CPU_BITS := 32 |
187 else |
187 else |