Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 05 Sep 2019 18:49:45 +0800
- author
- aoqi
- date
- Thu, 05 Sep 2019 18:49:45 +0800
- changeset 2438
- f4b08401e50d
- parent 2412
- 0cafacf400c9
- parent 2437
- eeeabadc6bf0
- child 2439
- 9ab1212dc980
Merge
1.1 --- a/.hgtags Thu Sep 05 18:40:51 2019 +0800 1.2 +++ b/.hgtags Thu Sep 05 18:49:45 2019 +0800 1.3 @@ -969,5 +969,17 @@ 1.4 3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00 1.5 5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01 1.6 7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02 1.7 +5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-b03 1.8 +d43cf567cf721406472abc52d12980a25b886577 jdk8u212-b04 1.9 +5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-ga 1.10 2e38e8d106def342538e5ca347f4bf67562e78f1 mips64el-jdk8u212-b04 1.11 5e59cea34a7a127b1a453527b04767c653239b2b mips64el-jdk8u212-b05 1.12 +84adf64edebbcb31edf2e8ac20a3f601cdd80e1f jdk8u222-b01 1.13 +3a2c8d0a600d5cf404ed1783036b3fb5b0f9c53d jdk8u222-b02 1.14 +2618046271a463d595918d176ec50cce563448ba jdk8u222-b03 1.15 +4e53c50e441a3b4a2904d8895c50a77bf558b9d8 jdk8u222-b04 1.16 +8f29b4acc5d2ee4131b1f13d8c3e57be3dcc63a9 jdk8u222-b05 1.17 +f0f617923cebf0b6dfc1c4cd61467fea847b028d jdk8u222-b06 1.18 +f321c0bb9fb3124dc35c98d5114c1a8cf4b3d498 jdk8u222-b07 1.19 +945f4ae40e436792154bfa77336e1d466606ae00 jdk8u222-b08 1.20 +81dd104fa95943fe02bc013d36155b5f4d54210d jdk8u222-b09
2.1 --- a/THIRD_PARTY_README Thu Sep 05 18:40:51 2019 +0800 2.2 +++ b/THIRD_PARTY_README Thu Sep 05 18:49:45 2019 +0800 2.3 @@ -1612,7 +1612,7 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, 2.8 +%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 2.9 which may be included with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 @@ -1682,7 +1682,7 @@ 2.13 --- begin of LICENSE --- 2.14 2.15 Mesa 3-D graphics library 2.16 - Version: 4.1 2.17 + Version: 5.0 2.18 2.19 Copyright (C) 1999-2002 Brian Paul All Rights Reserved. 2.20 2.21 @@ -2797,61 +2797,8 @@ 2.22 not be used in advertising or otherwise to promote the sale, use or 2.23 other dealings in this Software without prior written authorization 2.24 from the X Consortium. 2.25 -___________________________ 2.26 -The files in motif/lib/Xm/util included this copyright:mkdirhier.man, 2.27 -xmkmf.man, chownxterm.c, makeg.man, mergelib.cpp, lndir.man, makestrs.man, 2.28 -checktree.c, lndir.c, makestrs.c 2.29 -Copyright (c) 1993, 1994 X Consortium 2.30 - 2.31 -Permission is hereby granted, free of charge, to any person obtaining a 2.32 -copy of this software and associated documentation files (the "Software"), 2.33 -to deal in the Software without restriction, including without limitation 2.34 -the rights to use, copy, modify, merge, publish, distribute, sublicense, 2.35 -and/or sell copies of the Software, and to permit persons to whom the 2.36 -Software furnished to do so, subject to the following conditions: 2.37 - 2.38 -The above copyright notice and this permission notice shall be included in 2.39 -all copies or substantial portions of the Software. 2.40 - 2.41 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 2.42 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.43 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 2.44 -THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 2.45 -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 2.46 -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 2.47 -SOFTWARE. 2.48 - 2.49 -Except as contained in this notice, the name of the X Consortium shall not 2.50 -be used in advertising or otherwise to promote the sale, use or other 2.51 -dealing in this Software without prior written authorization from the 2.52 -X Consortium. 2.53 -_____________________________ 2.54 -Xmos_r.h: 2.55 -/* 2.56 -Copyright (c) 1996 X Consortium 2.57 - 2.58 -Permission is hereby granted, free of charge, to any person obtaining a copy 2.59 -of this software and associated documentation files (the "Software"), to deal 2.60 -in the Software without restriction, including without limitation the rights 2.61 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 2.62 -copies of the Software, and to permit persons to whom the Software is 2.63 -furnished to do so, subject to the following conditions: 2.64 - 2.65 -The above copyright notice and this permission notice shall be included in 2.66 -all copies or substantial portions of the Software. 2.67 - 2.68 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 2.69 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.70 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 2.71 -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN 2.72 -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 2.73 -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 2.74 - 2.75 -Except as contained in this notice, the name of the X Consortium shall not be 2.76 -used in advertising or otherwise to promote the sale, use or other dealings 2.77 -in this Software without prior written authorization from the X Consortium. 2.78 -*/ 2.79 - 2.80 + 2.81 +--- end of LICENSE --- 2.82 _____________________________ 2.83 Copyright notice for HPkeysym.h: 2.84 /* 2.85 @@ -2906,55 +2853,6 @@ 2.86 performance, or use of this material. 2.87 2.88 */ 2.89 -_____________________________________ 2.90 -Copyright notice in keysym2ucs.h: 2.91 - 2.92 -Copyright 1987, 1994, 1998 The Open Group 2.93 - 2.94 -Permission to use, copy, modify, distribute, and sell this software and its 2.95 -documentation for any purpose is hereby granted without fee, provided that 2.96 -the above copyright notice appear in all copies and that both that 2.97 -copyright notice and this permission notice appear in supporting 2.98 -documentation. 2.99 - 2.100 -The above copyright notice and this permission notice shall be included 2.101 -in all copies or substantial portions of the Software. 2.102 - 2.103 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 2.104 -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 2.105 -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 2.106 -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR 2.107 -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 2.108 -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 2.109 -OTHER DEALINGS IN THE SOFTWARE. 2.110 - 2.111 -Except as contained in this notice, the name of The Open Group shall 2.112 -not be used in advertising or otherwise to promote the sale, use or 2.113 -other dealings in this Software without prior written authorization 2.114 -from The Open Group. 2.115 - 2.116 - 2.117 -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts 2.118 - 2.119 -All Rights Reserved 2.120 - 2.121 -Permission to use, copy, modify, and distribute this software and its 2.122 -documentation for any purpose and without fee is hereby granted, 2.123 -provided that the above copyright notice appear in all copies and that 2.124 -both that copyright notice and this permission notice appear in 2.125 -supporting documentation, and that the name of Digital not be 2.126 -used in advertising or publicity pertaining to distribution of the 2.127 -software without specific, written prior permission. 2.128 - 2.129 -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING 2.130 -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL 2.131 -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR 2.132 -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 2.133 -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 2.134 -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 2.135 -SOFTWARE. 2.136 - 2.137 -*/ 2.138 2.139 --- end of LICENSE --- 2.140 2.141 @@ -3000,7 +2898,7 @@ 2.142 Apache Jakarta BCEL 5.1 2.143 Apache Jakarta Regexp 1.4 2.144 Apache Santuario XML Security for Java 1.5.4 2.145 - Apache Xalan-Java 2.7.1 2.146 + Apache Xalan-Java 2.7.2 2.147 Apache Xerces Java 2.10.0 2.148 Apache XML Resolver 1.1 2.149
3.1 --- a/common/autoconf/flags.m4 Thu Sep 05 18:40:51 2019 +0800 3.2 +++ b/common/autoconf/flags.m4 Thu Sep 05 18:49:45 2019 +0800 3.3 @@ -450,6 +450,7 @@ 3.4 # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build. 3.5 # 3.6 3.7 + FDLIBM_CFLAGS="" 3.8 # Setup compiler/platform specific flags to CFLAGS_JDK, 3.9 # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) 3.10 if test "x$TOOLCHAIN_TYPE" = xgcc; then 3.11 @@ -474,6 +475,37 @@ 3.12 ;; 3.13 esac 3.14 TOOLCHAIN_CHECK_COMPILER_VERSION(6, FLAGS_SETUP_GCC6_COMPILER_FLAGS) 3.15 + 3.16 + # Check that the compiler supports -ffp-contract=off flag 3.17 + # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. 3.18 + # For GCC < 4.6, on x86, x86_64 and ppc check for 3.19 + # -mno-fused-madd and -fno-strict-aliasing. If they exist, 3.20 + # use them as a substitute for -ffp-contract=off. 3.21 + # 3.22 + # These flags are required for GCC-based builds of 3.23 + # fdlibm with optimization without losing precision. 3.24 + # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, 3.25 + # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 3.26 + COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" 3.27 + FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]COMPILER_FP_CONTRACT_OFF_FLAG -Werror], 3.28 + [], [COMPILER_FP_CONTRACT_OFF_FLAG=""]) 3.29 + if test "x$COMPILER_FP_CONTRACT_OFF_FLAG" = x; then 3.30 + if test "$OPENJDK_TARGET_CPU_ARCH" = "x86" || 3.31 + test "$OPENJDK_TARGET_CPU_ARCH" = "x86_64" || 3.32 + test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then 3.33 + M_NO_FUSED_ADD_FLAG="-mno-fused-madd" 3.34 + FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]M_NO_FUSED_ADD_FLAG -Werror], 3.35 + [], [M_NO_FUSED_ADD_FLAG=""]) 3.36 + NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" 3.37 + FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]NO_STRICT_ALIASING_FLAG -Werror], 3.38 + [], [NO_STRICT_ALIASING_FLAG=""]) 3.39 + if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then 3.40 + FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" 3.41 + fi 3.42 + fi 3.43 + else 3.44 + FDLIBM_CFLAGS="$COMPILER_FP_CONTRACT_OFF_FLAG" 3.45 + fi 3.46 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then 3.47 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS" 3.48 if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then 3.49 @@ -505,6 +537,7 @@ 3.50 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB" 3.51 fi 3.52 fi 3.53 + AC_SUBST(FDLIBM_CFLAGS) 3.54 3.55 ############################################################################### 3.56
4.1 --- a/common/autoconf/generated-configure.sh Thu Sep 05 18:40:51 2019 +0800 4.2 +++ b/common/autoconf/generated-configure.sh Thu Sep 05 18:49:45 2019 +0800 4.3 @@ -686,6 +686,7 @@ 4.4 CFLAGS_JDKEXE 4.5 CFLAGS_JDKLIB 4.6 MACOSX_VERSION_MIN 4.7 +FDLIBM_CFLAGS 4.8 NO_LIFETIME_DSE_CFLAG 4.9 NO_DELETE_NULL_POINTER_CHECKS_CFLAG 4.10 LEGACY_EXTRA_LDFLAGS 4.11 @@ -3911,7 +3912,7 @@ 4.12 4.13 4.14 # 4.15 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. 4.16 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 4.17 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.18 # 4.19 # This code is free software; you can redistribute it and/or modify it 4.20 @@ -4384,7 +4385,7 @@ 4.21 #CUSTOM_AUTOCONF_INCLUDE 4.22 4.23 # Do not change or remove the following line, it is needed for consistency checks: 4.24 -DATE_WHEN_GENERATED=1554371898 4.25 +DATE_WHEN_GENERATED=1556533111 4.26 4.27 ############################################################################### 4.28 # 4.29 @@ -41617,6 +41618,7 @@ 4.30 # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build. 4.31 # 4.32 4.33 + FDLIBM_CFLAGS="" 4.34 # Setup compiler/platform specific flags to CFLAGS_JDK, 4.35 # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?) 4.36 if test "x$TOOLCHAIN_TYPE" = xgcc; then 4.37 @@ -41858,6 +41860,148 @@ 4.38 : 4.39 fi 4.40 4.41 + 4.42 + # Check that the compiler supports -ffp-contract=off flag 4.43 + # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. 4.44 + # For GCC < 4.6, on x86, x86_64 and ppc check for 4.45 + # -mno-fused-madd and -fno-strict-aliasing. If they exist, 4.46 + # use them as a substitute for -ffp-contract=off. 4.47 + # 4.48 + # These flags are required for GCC-based builds of 4.49 + # fdlibm with optimization without losing precision. 4.50 + # Notably, -ffp-contract=off needs to be added for GCC >= 4.6, 4.51 + # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 4.52 + COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" 4.53 + 4.54 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"" >&5 4.55 +$as_echo_n "checking if the C++ compiler supports \"$COMPILER_FP_CONTRACT_OFF_FLAG -Werror\"... " >&6; } 4.56 + supports=yes 4.57 + 4.58 + saved_cxxflags="$CXXFLAGS" 4.59 + CXXFLAGS="$CXXFLAG $COMPILER_FP_CONTRACT_OFF_FLAG -Werror" 4.60 + ac_ext=cpp 4.61 +ac_cpp='$CXXCPP $CPPFLAGS' 4.62 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.63 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.64 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.65 + 4.66 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4.67 +/* end confdefs.h. */ 4.68 +int i; 4.69 +_ACEOF 4.70 +if ac_fn_cxx_try_compile "$LINENO"; then : 4.71 + 4.72 +else 4.73 + supports=no 4.74 +fi 4.75 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4.76 + ac_ext=cpp 4.77 +ac_cpp='$CXXCPP $CPPFLAGS' 4.78 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.79 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.80 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.81 + 4.82 + CXXFLAGS="$saved_cxxflags" 4.83 + 4.84 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 4.85 +$as_echo "$supports" >&6; } 4.86 + if test "x$supports" = "xyes" ; then 4.87 + : 4.88 + else 4.89 + COMPILER_FP_CONTRACT_OFF_FLAG="" 4.90 + fi 4.91 + 4.92 + if test "x$COMPILER_FP_CONTRACT_OFF_FLAG" = x; then 4.93 + if test "$OPENJDK_TARGET_CPU_ARCH" = "x86" || 4.94 + test "$OPENJDK_TARGET_CPU_ARCH" = "x86_64" || 4.95 + test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then 4.96 + M_NO_FUSED_ADD_FLAG="-mno-fused-madd" 4.97 + 4.98 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG -Werror\"" >&5 4.99 +$as_echo_n "checking if the C++ compiler supports \"$M_NO_FUSED_ADD_FLAG -Werror\"... " >&6; } 4.100 + supports=yes 4.101 + 4.102 + saved_cxxflags="$CXXFLAGS" 4.103 + CXXFLAGS="$CXXFLAG $M_NO_FUSED_ADD_FLAG -Werror" 4.104 + ac_ext=cpp 4.105 +ac_cpp='$CXXCPP $CPPFLAGS' 4.106 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.107 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.108 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.109 + 4.110 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4.111 +/* end confdefs.h. */ 4.112 +int i; 4.113 +_ACEOF 4.114 +if ac_fn_cxx_try_compile "$LINENO"; then : 4.115 + 4.116 +else 4.117 + supports=no 4.118 +fi 4.119 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4.120 + ac_ext=cpp 4.121 +ac_cpp='$CXXCPP $CPPFLAGS' 4.122 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.123 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.124 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.125 + 4.126 + CXXFLAGS="$saved_cxxflags" 4.127 + 4.128 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 4.129 +$as_echo "$supports" >&6; } 4.130 + if test "x$supports" = "xyes" ; then 4.131 + : 4.132 + else 4.133 + M_NO_FUSED_ADD_FLAG="" 4.134 + fi 4.135 + 4.136 + NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" 4.137 + 4.138 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG -Werror\"" >&5 4.139 +$as_echo_n "checking if the C++ compiler supports \"$NO_STRICT_ALIASING_FLAG -Werror\"... " >&6; } 4.140 + supports=yes 4.141 + 4.142 + saved_cxxflags="$CXXFLAGS" 4.143 + CXXFLAGS="$CXXFLAG $NO_STRICT_ALIASING_FLAG -Werror" 4.144 + ac_ext=cpp 4.145 +ac_cpp='$CXXCPP $CPPFLAGS' 4.146 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.147 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.148 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.149 + 4.150 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 4.151 +/* end confdefs.h. */ 4.152 +int i; 4.153 +_ACEOF 4.154 +if ac_fn_cxx_try_compile "$LINENO"; then : 4.155 + 4.156 +else 4.157 + supports=no 4.158 +fi 4.159 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4.160 + ac_ext=cpp 4.161 +ac_cpp='$CXXCPP $CPPFLAGS' 4.162 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4.163 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4.164 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 4.165 + 4.166 + CXXFLAGS="$saved_cxxflags" 4.167 + 4.168 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 4.169 +$as_echo "$supports" >&6; } 4.170 + if test "x$supports" = "xyes" ; then 4.171 + : 4.172 + else 4.173 + NO_STRICT_ALIASING_FLAG="" 4.174 + fi 4.175 + 4.176 + if test "x$M_NO_FUSED_ADD_FLAG" != "x" && test "x$NO_STRICT_ALIASING_FLAG" != "x"; then 4.177 + FDLIBM_CFLAGS="$M_NO_FUSED_ADD_FLAG $NO_STRICT_ALIASING_FLAG" 4.178 + fi 4.179 + fi 4.180 + else 4.181 + FDLIBM_CFLAGS="$COMPILER_FP_CONTRACT_OFF_FLAG" 4.182 + fi 4.183 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then 4.184 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS" 4.185 if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then 4.186 @@ -41890,6 +42034,7 @@ 4.187 fi 4.188 fi 4.189 4.190 + 4.191 ############################################################################### 4.192 4.193 # Adjust flags according to debug level.
5.1 --- a/common/autoconf/spec.gmk.in Thu Sep 05 18:40:51 2019 +0800 5.2 +++ b/common/autoconf/spec.gmk.in Thu Sep 05 18:49:45 2019 +0800 5.3 @@ -330,6 +330,7 @@ 5.4 FREETYPE_LIBS:=@FREETYPE_LIBS@ 5.5 FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@ 5.6 FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@ 5.7 +FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@ 5.8 CUPS_CFLAGS:=@CUPS_CFLAGS@ 5.9 ALSA_LIBS:=@ALSA_LIBS@ 5.10 ALSA_CFLAGS:=@ALSA_CFLAGS@ 5.11 @@ -378,6 +379,7 @@ 5.12 CC:=@FIXPATH@ @CCACHE@ @CC@ 5.13 5.14 # CFLAGS used to compile the jdk native libraries (C-code) 5.15 +FDLIBM_CFLAGS:=@FDLIBM_CFLAGS@ 5.16 CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@ 5.17 CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@ 5.18
6.1 --- a/make/Main.gmk Thu Sep 05 18:40:51 2019 +0800 6.2 +++ b/make/Main.gmk Thu Sep 05 18:49:45 2019 +0800 6.3 @@ -238,7 +238,7 @@ 6.4 else 6.5 @$(ECHO) "Re-running configure using default settings" 6.6 endif 6.7 - @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure "$(CONFIGURE_COMMAND_LINE)" ) 6.8 + @( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) ) 6.9 6.10 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs 6.11 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
7.1 --- a/make/common/MakeBase.gmk Thu Sep 05 18:40:51 2019 +0800 7.2 +++ b/make/common/MakeBase.gmk Thu Sep 05 18:49:45 2019 +0800 7.3 @@ -293,8 +293,8 @@ 7.4 7.5 endef 7.6 7.7 -# The source tips can come from the Mercurial repository, or in the files 7.8 -# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same 7.9 +# The source ids can come from the Mercurial repository, or in the files 7.10 +# $(HGTIP_FILENAME) which contains the id but is also positioned in the same 7.11 # directory as the original $(HGDIR) directory. 7.12 # These should not be := assignments, only used from the root Makefile. 7.13 HG_VERSION = $(shell $(HG) version 2> /dev/null) 7.14 @@ -306,7 +306,7 @@ 7.15 $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \ 7.16 2> /dev/null))))) 7.17 7.18 -# Emit the repo:tip pairs to $@ 7.19 +# Emit the repo:id pairs to $@ 7.20 define GetSourceTips 7.21 $(CD) $(SRC_ROOT) ; \ 7.22 for i in $(REPO_LIST) IGNORE ; do \ 7.23 @@ -314,7 +314,7 @@ 7.24 continue; \ 7.25 elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \ 7.26 $(PRINTF) " %s:%s" \ 7.27 - "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \ 7.28 + "$${i}" `$(HG) id -i --repository $${i}` ; \ 7.29 elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \ 7.30 $(PRINTF) " %s:%s" \ 7.31 "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \ 7.32 @@ -325,7 +325,7 @@ 7.33 7.34 # Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk 7.35 define CreateHgTip 7.36 - $(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \ 7.37 + $(HG) id -i --repository $1' > $1/$(HGTIP_FILENAME); \ 7.38 $(ECHO) $1/$(HGTIP_FILENAME) 7.39 endef 7.40
