496     # Pickup extra debug dependent variables for CXXFLAGS
 497     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
 498     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
 499     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
 500   else
 501     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
 502     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
 503     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
 504   endif
 505 
 506   # If no C++ flags are explicitly set, default to using the C flags.
 507   # After that, we can set additional C++ flags that should not interfere
 508   # with the mechanism for copying the C flags by default.
 509   ifeq ($$($1_CXXFLAGS),)
 510     $1_CXXFLAGS:=$$($1_CFLAGS)
 511   endif
 512   ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
 513     $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
 514   endif
 515 




 516   ifeq ($$($1_DEBUG_SYMBOLS), true)
 517     ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
 518       ifdef OPENJDK
 519         # Always add debug symbols
 520         $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
 521         $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
 522       else
 523         # Programs don't get the debug symbols added in the old build. It's not clear if
 524         # this is intentional.
 525         ifeq ($$($1_PROGRAM),)
 526           $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
 527           $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
 528         endif
 529       endif
 530     endif
 531   endif
 532 
 533   ifneq (,$$($1_REORDER))
 534     $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
 535     $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)

 496     # Pickup extra debug dependent variables for CXXFLAGS
 497     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
 498     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
 499     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
 500   else
 501     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
 502     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
 503     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
 504   endif
 505 
 506   # If no C++ flags are explicitly set, default to using the C flags.
 507   # After that, we can set additional C++ flags that should not interfere
 508   # with the mechanism for copying the C flags by default.
 509   ifeq ($$($1_CXXFLAGS),)
 510     $1_CXXFLAGS:=$$($1_CFLAGS)
 511   endif
 512   ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
 513     $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
 514   endif
 515 
 516   ifeq ($(DEBUG_BINARIES), true)
 517     $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
 518     $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
 519   endif
 520   ifeq ($$($1_DEBUG_SYMBOLS), true)
 521     ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
 522       ifdef OPENJDK
 523         # Always add debug symbols
 524         $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
 525         $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
 526       else
 527         # Programs don't get the debug symbols added in the old build. It's not clear if
 528         # this is intentional.
 529         ifeq ($$($1_PROGRAM),)
 530           $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
 531           $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
 532         endif
 533       endif
 534     endif
 535   endif
 536 
 537   ifneq (,$$($1_REORDER))
 538     $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
 539     $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)