Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/Makefile	Mon Feb 14 03:19:33 2011 -0800
     1.2 +++ b/make/Makefile	Mon Feb 14 19:27:36 2011 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2005, 2011, 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 @@ -43,6 +43,7 @@
    1.11  #  ALT_OUTPUTDIR              Output directory to use for hotspot build
    1.12  #  ALT_EXPORT_PATH            Directory to export hotspot build to
    1.13  #  ALT_JDK_IMPORT_PATH        Current JDK build (only for create_jdk rules)
    1.14 +#  ALT_JDK_TARGET_IMPORT_PATH Current JDK build when cross-compiling
    1.15  #  ALT_BUILD_WIN_SA           Building SA on Windows is disabled by default.
    1.16  #                             Set ALT_BUILD_WIN_SA=1 to enable building SA on
    1.17  #                             Windows.

     2.1 --- a/make/defs.make	Mon Feb 14 03:19:33 2011 -0800
     2.2 +++ b/make/defs.make	Mon Feb 14 19:27:36 2011 -0500
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2006, 2011, 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 @@ -162,6 +162,13 @@
    2.11    JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH)
    2.12  endif
    2.13  
    2.14 +# Other parts of JDK build may require an import JDK that can be executed
    2.15 +# on the build host. For cross-compile builds we also need an import JDK
    2.16 +# that matches the target arch, so for that we set ALT_JDK_TARGET_IMPORT_PATH
    2.17 +ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),)
    2.18 +  JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH)
    2.19 +endif
    2.20 +
    2.21  # Find JDK used for javac compiles
    2.22  BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM)
    2.23  ifneq ($(ALT_BOOTDIR),)