make/common/NativeCompilation.gmk

*** 306,338 ****
    # Clean out the superfluous object files.
    ifneq ($$($1_SUPERFLUOUS_OBJS),)
      $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
!   $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
    ifneq ($(DEBUG_LEVEL),release)
      # Pickup extra debug dependent variables for CFLAGS
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
!     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
    else
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
!     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
!   $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
    ifneq ($(DEBUG_LEVEL),release)
      # Pickup extra debug dependent variables for CXXFLAGS
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
!     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
    else
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
!     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
    endif
  
    ifneq (,$$($1_DEBUG_SYMBOLS))
      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
--- 306,338 ----
    # Clean out the superfluous object files.
    ifneq ($$($1_SUPERFLUOUS_OBJS),)
      $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
!   $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
    ifneq ($(DEBUG_LEVEL),release)
      # Pickup extra debug dependent variables for CFLAGS
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
!     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
    else
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
!     $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
!   $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
    ifneq ($(DEBUG_LEVEL),release)
      # Pickup extra debug dependent variables for CXXFLAGS
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
!     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
    else
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
!     $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
      $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
    endif
  
    ifneq (,$$($1_DEBUG_SYMBOLS))
      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
*** 418,431 ****
                  $$(MV) $$@.tmp $$@
        endif
      endif
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
    # for LDFLAGS and LDFLAGS_SUFFIX
!   $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
!   $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
    ifneq (,$$($1_REAL_MAPFILE))
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
    $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
--- 418,431 ----
                  $$(MV) $$@.tmp $$@
        endif
      endif
    endif
  
!   # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables
    # for LDFLAGS and LDFLAGS_SUFFIX
!   $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
!   $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
    ifneq (,$$($1_REAL_MAPFILE))
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
    $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)