Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Thu Oct 24 10:43:35 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Oct 24 20:45:43 2013 -0400
     1.3 @@ -869,6 +869,7 @@
     1.4  ZERO_ARCHDEF
     1.5  DEFINE_CROSS_COMPILE_ARCH
     1.6  LP64
     1.7 +OPENJDK_TARGET_OS_EXPORT_DIR
     1.8  OPENJDK_TARGET_OS_API_DIR
     1.9  OPENJDK_TARGET_CPU_JLI_CFLAGS
    1.10  OPENJDK_TARGET_CPU_OSARCH
    1.11 @@ -3864,7 +3865,7 @@
    1.12  #CUSTOM_AUTOCONF_INCLUDE
    1.13  
    1.14  # Do not change or remove the following line, it is needed for consistency checks:
    1.15 -DATE_WHEN_GENERATED=1382540536
    1.16 +DATE_WHEN_GENERATED=1382659005
    1.17  
    1.18  ###############################################################################
    1.19  #
    1.20 @@ -7149,6 +7150,13 @@
    1.21    fi
    1.22  
    1.23  
    1.24 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    1.25 +      OPENJDK_TARGET_OS_EXPORT_DIR=macosx
    1.26 +  else
    1.27 +      OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
    1.28 +  fi
    1.29 +
    1.30 +
    1.31    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
    1.32      A_LP64="LP64:="
    1.33      # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
    1.34 @@ -29638,7 +29646,7 @@
    1.35        -I${JDK_OUTPUTDIR}/include \
    1.36        -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
    1.37        -I${JDK_TOPDIR}/src/share/javavm/export \
    1.38 -      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
    1.39 +      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
    1.40        -I${JDK_TOPDIR}/src/share/native/common \
    1.41        -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
    1.42  

     2.1 --- a/common/autoconf/platform.m4	Thu Oct 24 10:43:35 2013 +0200
     2.2 +++ b/common/autoconf/platform.m4	Thu Oct 24 20:45:43 2013 -0400
     2.3 @@ -327,6 +327,13 @@
     2.4    fi
     2.5    AC_SUBST(OPENJDK_TARGET_OS_API_DIR)
     2.6  
     2.7 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     2.8 +      OPENJDK_TARGET_OS_EXPORT_DIR=macosx
     2.9 +  else
    2.10 +      OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
    2.11 +  fi
    2.12 +  AC_SUBST(OPENJDK_TARGET_OS_EXPORT_DIR)
    2.13 +
    2.14    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
    2.15      A_LP64="LP64:="
    2.16      # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in

     3.1 --- a/common/autoconf/spec.gmk.in	Thu Oct 24 10:43:35 2013 +0200
     3.2 +++ b/common/autoconf/spec.gmk.in	Thu Oct 24 20:45:43 2013 -0400
     3.3 @@ -92,6 +92,7 @@
     3.4  OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
     3.5  OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
     3.6  OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@
     3.7 +OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
     3.8  
     3.9  # We are building on this build system.
    3.10  # When not cross-compiling, it is the same as the target.

     4.1 --- a/common/autoconf/toolchain.m4	Thu Oct 24 10:43:35 2013 +0200
     4.2 +++ b/common/autoconf/toolchain.m4	Thu Oct 24 20:45:43 2013 -0400
     4.3 @@ -942,7 +942,7 @@
     4.4        -I${JDK_OUTPUTDIR}/include \
     4.5        -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
     4.6        -I${JDK_TOPDIR}/src/share/javavm/export \
     4.7 -      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
     4.8 +      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
     4.9        -I${JDK_TOPDIR}/src/share/native/common \
    4.10        -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
    4.11