Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/common/NativeCompilation.gmk	Tue Dec 20 15:23:11 2016 -0800
     1.2 +++ b/make/common/NativeCompilation.gmk	Wed Jan 04 19:43:21 2017 +0000
     1.3 @@ -297,17 +297,21 @@
     1.4      $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
     1.5    endif
     1.6  
     1.7 -  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
     1.8 -  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
     1.9 +  # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus
    1.10 +  # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS.
    1.11 +  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \
    1.12 +      $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU))
    1.13    ifneq ($(DEBUG_LEVEL),release)
    1.14      # Pickup extra debug dependent variables for CFLAGS
    1.15      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
    1.16      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
    1.17      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
    1.18 +    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug)
    1.19    else
    1.20      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
    1.21      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
    1.22      $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
    1.23 +    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
    1.24    endif
    1.25  
    1.26    # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.