Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Mon Apr 01 21:11:51 2013 -0700
     1.2 +++ b/.hgtags	Tue Apr 02 11:55:09 2013 -0700
     1.3 @@ -203,3 +203,5 @@
     1.4  91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79
     1.5  907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80
     1.6  145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81
     1.7 +29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82
     1.8 +466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83

     2.1 --- a/common/autoconf/configure.ac	Mon Apr 01 21:11:51 2013 -0700
     2.2 +++ b/common/autoconf/configure.ac	Tue Apr 02 11:55:09 2013 -0700
     2.3 @@ -194,6 +194,7 @@
     2.4  ###############################################################################
     2.5  
     2.6  JDKOPT_SETUP_BUILD_TWEAKS
     2.7 +JDKOPT_DETECT_INTREE_EC
     2.8  
     2.9  ###############################################################################
    2.10  #

     3.1 --- a/common/autoconf/generated-configure.sh	Mon Apr 01 21:11:51 2013 -0700
     3.2 +++ b/common/autoconf/generated-configure.sh	Tue Apr 02 11:55:09 2013 -0700
     3.3 @@ -612,6 +612,7 @@
     3.4  JOBS
     3.5  MEMORY_SIZE
     3.6  NUM_CORES
     3.7 +ENABLE_INTREE_EC
     3.8  SALIB_NAME
     3.9  HOTSPOT_MAKE_ARGS
    3.10  FIXPATH
    3.11 @@ -3752,7 +3753,7 @@
    3.12  #CUSTOM_AUTOCONF_INCLUDE
    3.13  
    3.14  # Do not change or remove the following line, it is needed for consistency checks:
    3.15 -DATE_WHEN_GENERATED=1363150186
    3.16 +DATE_WHEN_GENERATED=1363706268
    3.17  
    3.18  ###############################################################################
    3.19  #
    3.20 @@ -10786,6 +10787,12 @@
    3.21  
    3.22  ###############################################################################
    3.23  #
    3.24 +# Enable or disable the elliptic curve crypto implementation
    3.25 +#
    3.26 +
    3.27 +
    3.28 +###############################################################################
    3.29 +#
    3.30  # Compress jars
    3.31  #
    3.32  COMPRESS_JARS=false
    3.33 @@ -29823,7 +29830,7 @@
    3.34  _ACEOF
    3.35   X11_A_OK=yes
    3.36  else
    3.37 -  X11_A_OK=no
    3.38 +  X11_A_OK=no; break
    3.39  fi
    3.40  
    3.41  done
    3.42 @@ -31694,6 +31701,22 @@
    3.43  
    3.44  
    3.45  
    3.46 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
    3.47 +$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
    3.48 +
    3.49 +if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
    3.50 +    ENABLE_INTREE_EC=yes
    3.51 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    3.52 +$as_echo "yes" >&6; }
    3.53 +else
    3.54 +    ENABLE_INTREE_EC=no
    3.55 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    3.56 +$as_echo "no" >&6; }
    3.57 +fi
    3.58 +
    3.59 +
    3.60 +
    3.61 +
    3.62  ###############################################################################
    3.63  #
    3.64  # Configure parts of the build that only affect the build performance,

     4.1 --- a/common/autoconf/jdk-options.m4	Mon Apr 01 21:11:51 2013 -0700
     4.2 +++ b/common/autoconf/jdk-options.m4	Tue Apr 02 11:55:09 2013 -0700
     4.3 @@ -366,6 +366,25 @@
     4.4  
     4.5  ###############################################################################
     4.6  #
     4.7 +# Enable or disable the elliptic curve crypto implementation
     4.8 +#
     4.9 +AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
    4.10 +[
    4.11 +AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
    4.12 +
    4.13 +if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
    4.14 +    ENABLE_INTREE_EC=yes
    4.15 +    AC_MSG_RESULT([yes])
    4.16 +else
    4.17 +    ENABLE_INTREE_EC=no
    4.18 +    AC_MSG_RESULT([no])
    4.19 +fi
    4.20 +
    4.21 +AC_SUBST(ENABLE_INTREE_EC)
    4.22 +])
    4.23 +
    4.24 +###############################################################################
    4.25 +#
    4.26  # Compress jars
    4.27  #
    4.28  COMPRESS_JARS=false

     5.1 --- a/common/autoconf/libraries.m4	Mon Apr 01 21:11:51 2013 -0700
     5.2 +++ b/common/autoconf/libraries.m4	Tue Apr 02 11:55:09 2013 -0700
     5.3 @@ -182,7 +182,7 @@
     5.4  # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
     5.5  AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
     5.6                   [X11_A_OK=yes],
     5.7 -                 [X11_A_OK=no],
     5.8 +                 [X11_A_OK=no; break],
     5.9                   [ # include <X11/Xlib.h>
    5.10                     # include <X11/Xutil.h>
    5.11                   ])

     6.1 --- a/common/autoconf/spec.gmk.in	Mon Apr 01 21:11:51 2013 -0700
     6.2 +++ b/common/autoconf/spec.gmk.in	Tue Apr 02 11:55:09 2013 -0700
     6.3 @@ -539,6 +539,7 @@
     6.4  
     6.5  # Build setup
     6.6  ENABLE_JFR=@ENABLE_JFR@
     6.7 +ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
     6.8  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
     6.9  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
    6.10  USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@