Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/Defs-internal.gmk	Fri Mar 30 16:51:57 2012 -0700
     1.2 +++ b/make/Defs-internal.gmk	Tue Apr 03 10:17:06 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -354,3 +354,12 @@
    1.11    COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
    1.12  endif
    1.13  
    1.14 +# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES,
    1.15 +# then these can be set here:
    1.16 +#ifdef FULL_DEBUG_SYMBOLS
    1.17 +#  COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
    1.18 +#endif
    1.19 +#
    1.20 +#ifdef ZIP_DEBUGINFO_FILES
    1.21 +#  COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
    1.22 +#endif

     2.1 --- a/make/hotspot-rules.gmk	Fri Mar 30 16:51:57 2012 -0700
     2.2 +++ b/make/hotspot-rules.gmk	Tue Apr 03 10:17:06 2012 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -71,6 +71,7 @@
    2.11  ifeq ($(DEBUG_NAME), fastdebug)
    2.12    HOTSPOT_TARGET = all_fastdebug
    2.13  endif
    2.14 +BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%)
    2.15  
    2.16  ifeq ($(ZERO_BUILD), true)
    2.17    ifeq ($(SHARK_BUILD), true)
    2.18 @@ -83,6 +84,7 @@
    2.19  HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
    2.20  HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
    2.21  HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
    2.22 +HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
    2.23  
    2.24  # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
    2.25  #   Or is there something wrong with hotspot/make/Makefile?
    2.26 @@ -93,6 +95,16 @@
    2.27    HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
    2.28  endif
    2.29  
    2.30 +# Move to COMMON_BUILD_ARGUMENTS when all repos support
    2.31 +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
    2.32 +ifdef FULL_DEBUG_SYMBOLS
    2.33 +  HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
    2.34 +endif
    2.35 +
    2.36 +ifdef ZIP_DEBUGINFO_FILES
    2.37 +  HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
    2.38 +endif
    2.39 +
    2.40  hotspot-build::
    2.41  	$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
    2.42  	$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)

     3.1 --- a/make/jdk-rules.gmk	Fri Mar 30 16:51:57 2012 -0700
     3.2 +++ b/make/jdk-rules.gmk	Tue Apr 03 10:17:06 2012 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10 @@ -70,6 +70,16 @@
    3.11  JDK_BUILD_ARGUMENTS += \
    3.12          BUILD_HOTSPOT=$(BUILD_HOTSPOT)
    3.13  
    3.14 +# Move to COMMON_BUILD_ARGUMENTS when all repos support
    3.15 +# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
    3.16 +ifdef FULL_DEBUG_SYMBOLS
    3.17 +  JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
    3.18 +endif
    3.19 +
    3.20 +ifdef ZIP_DEBUGINFO_FILES
    3.21 +  JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
    3.22 +endif
    3.23 +
    3.24  
    3.25  $(JDK_JAVA_EXE):: jdk-build
    3.26