295 # Clean out the superfluous object files. |
295 # Clean out the superfluous object files. |
296 ifneq ($$($1_SUPERFLUOUS_OBJS),) |
296 ifneq ($$($1_SUPERFLUOUS_OBJS),) |
297 $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) |
297 $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) |
298 endif |
298 endif |
299 |
299 |
300 # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS. |
300 # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus |
301 $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) |
301 # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS. |
|
302 $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \ |
|
303 $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)) |
302 ifneq ($(DEBUG_LEVEL),release) |
304 ifneq ($(DEBUG_LEVEL),release) |
303 # Pickup extra debug dependent variables for CFLAGS |
305 # Pickup extra debug dependent variables for CFLAGS |
304 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) |
306 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) |
305 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug) |
307 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug) |
306 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) |
308 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) |
|
309 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug) |
307 else |
310 else |
308 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) |
311 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) |
309 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release) |
312 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release) |
310 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) |
313 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) |
|
314 $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release) |
311 endif |
315 endif |
312 |
316 |
313 # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS. |
317 # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS. |
314 $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) |
318 $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) |
315 ifneq ($(DEBUG_LEVEL),release) |
319 ifneq ($(DEBUG_LEVEL),release) |