Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Sat, 09 Nov 2019 20:29:44 +0800
- author
- aoqi
- date
- Sat, 09 Nov 2019 20:29:44 +0800
- changeset 2458
- daa47f8cf745
- parent 2440
- 320af913b4de
- parent 2457
- 6b9f309807a2
- child 2459
- 8d5b7cddd9a1
Merge
| .hgtags | file | annotate | diff | comparison | revisions | |
| Makefile | file | annotate | diff | comparison | revisions | |
| THIRD_PARTY_README | file | annotate | diff | comparison | revisions | |
| common/autoconf/build-performance.m4 | file | annotate | diff | comparison | revisions | |
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| make/Main.gmk | file | annotate | diff | comparison | revisions | |
| test/Makefile | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Sat Nov 09 20:15:27 2019 +0800 1.2 +++ b/.hgtags Sat Nov 09 20:29:44 2019 +0800 1.3 @@ -967,6 +967,7 @@ 1.4 a8b6e38ee409be0fb8fc931a4762f9d04f2f2da0 jdk8u202-b26 1.5 0ea872ce75502739f90bacf092d471889673c757 jdk8u202-ga 1.6 3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00 1.7 +5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u222-b00 1.8 5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01 1.9 7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02 1.10 5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-b03 1.11 @@ -982,6 +983,17 @@ 1.12 f0f617923cebf0b6dfc1c4cd61467fea847b028d jdk8u222-b06 1.13 f321c0bb9fb3124dc35c98d5114c1a8cf4b3d498 jdk8u222-b07 1.14 945f4ae40e436792154bfa77336e1d466606ae00 jdk8u222-b08 1.15 +8f29b4acc5d2ee4131b1f13d8c3e57be3dcc63a9 jdk8u232-b00 1.16 81dd104fa95943fe02bc013d36155b5f4d54210d jdk8u222-b09 1.17 +eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-b10 1.18 +eeeabadc6bf04d70c2fb8e0492abbf30143d26f0 jdk8u222-ga 1.19 +ef88239d3d16c5b6817e44c4aba0749620fc79ff jdk8u232-b01 1.20 +ef851705e3e17fd968b9c8d2fd4bc04be34f0c5c jdk8u232-b02 1.21 f4b08401e50de07336f129b20f75e2f05f266a44 mips64el-jdk8u222-b11 1.22 9ab1212dc98032faba8f3b2b2ac5f30aaadf065c mips64el-jdk8u222-b12 1.23 +c5ca527b0afdafb0072f5e0810de13ec326e4b57 jdk8u232-b03 1.24 +9611ccdff5fe10bb27e5aa34cde295562d13a29b jdk8u232-b04 1.25 +2cd484c5b7f8463f5db0a73da92199255c212810 jdk8u232-b05 1.26 +aa1559aa1f70d79e8bd4f3de9ab9a48fe1c0cc78 jdk8u232-b06 1.27 +54af8189b95d47ea2cf8bdc9d90fb02d46a1fd38 jdk8u232-b07 1.28 +7aea873d47e1d93c7ef4902e758417e5afc19d9c jdk8u232-b08
2.1 --- a/Makefile Sat Nov 09 20:15:27 2019 +0800 2.2 +++ b/Makefile Sat Nov 09 20:29:44 2019 +0800 2.3 @@ -101,7 +101,7 @@ 2.4 $(info . # generated by configure) 2.5 $(info . make dist-clean # Remove all files, including configuration) 2.6 $(info . make help # Give some help on using make) 2.7 - $(info . make test # Run tests, default is all tests (see TEST below)) 2.8 + $(info . make test # Run tests, default is "jdk_core langtools_jtreg" (see TEST below)) 2.9 $(info ) 2.10 $(info Targets for specific components) 2.11 $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test)) 2.12 @@ -125,6 +125,8 @@ 2.13 $(info ) 2.14 $(info . make test TEST=<test> # Only run the given test or tests, e.g.) 2.15 $(info . # make test TEST="jdk_lang jdk_net") 2.16 + $(info . # or) 2.17 + $(info . # make test TEST="tier1") 2.18 $(info ) 2.19 2.20 .PHONY: help
3.1 --- a/THIRD_PARTY_README Sat Nov 09 20:15:27 2019 +0800 3.2 +++ b/THIRD_PARTY_README Sat Nov 09 20:29:44 2019 +0800 3.3 @@ -1470,60 +1470,90 @@ 3.4 3.5 ------------------------------------------------------------------------------- 3.6 3.7 -%% This notice is provided with respect to libpng 1.6.35, which may be 3.8 +%% This notice is provided with respect to libpng 1.6.37, which may be 3.9 included with JRE 8, JDK 8, and OpenJDK 8. 3.10 3.11 --- begin of LICENSE --- 3.12 3.13 -This copy of the libpng notices is provided for your convenience. In case of 3.14 -any discrepancy between this copy and the notices in the file png.h that is 3.15 -included in the libpng distribution, the latter shall prevail. 3.16 - 3.17 -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: 3.18 - 3.19 -If you modify libpng you may insert additional notices immediately following 3.20 -this sentence. 3.21 - 3.22 -This code is released under the libpng license. 3.23 - 3.24 -libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are 3.25 +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE 3.26 +========================================= 3.27 + 3.28 +PNG Reference Library License version 2 3.29 +--------------------------------------- 3.30 + 3.31 + * Copyright (c) 1995-2019 The PNG Reference Library Authors. 3.32 + * Copyright (c) 2018-2019 Cosmin Truta. 3.33 + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. 3.34 + * Copyright (c) 1996-1997 Andreas Dilger. 3.35 + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. 3.36 + 3.37 +The software is supplied "as is", without warranty of any kind, 3.38 +express or implied, including, without limitation, the warranties 3.39 +of merchantability, fitness for a particular purpose, title, and 3.40 +non-infringement. In no event shall the Copyright owners, or 3.41 +anyone distributing the software, be liable for any damages or 3.42 +other liability, whether in contract, tort or otherwise, arising 3.43 +from, out of, or in connection with the software, or the use or 3.44 +other dealings in the software, even if advised of the possibility 3.45 +of such damage. 3.46 + 3.47 +Permission is hereby granted to use, copy, modify, and distribute 3.48 +this software, or portions hereof, for any purpose, without fee, 3.49 +subject to the following restrictions: 3.50 + 3.51 + 1. The origin of this software must not be misrepresented; you 3.52 + must not claim that you wrote the original software. If you 3.53 + use this software in a product, an acknowledgment in the product 3.54 + documentation would be appreciated, but is not required. 3.55 + 3.56 + 2. Altered source versions must be plainly marked as such, and must 3.57 + not be misrepresented as being the original software. 3.58 + 3.59 + 3. This Copyright notice may not be removed or altered from any 3.60 + source or altered source distribution. 3.61 + 3.62 + 3.63 +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) 3.64 +----------------------------------------------------------------------- 3.65 + 3.66 +libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are 3.67 Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are 3.68 derived from libpng-1.0.6, and are distributed according to the same 3.69 disclaimer and license as libpng-1.0.6 with the following individuals 3.70 added to the list of Contributing Authors: 3.71 3.72 - Simon-Pierre Cadieux 3.73 - Eric S. Raymond 3.74 - Mans Rullgard 3.75 - Cosmin Truta 3.76 - Gilles Vollant 3.77 - James Yu 3.78 - Mandar Sahastrabuddhe 3.79 - Google Inc. 3.80 - Vadim Barkov 3.81 + Simon-Pierre Cadieux 3.82 + Eric S. Raymond 3.83 + Mans Rullgard 3.84 + Cosmin Truta 3.85 + Gilles Vollant 3.86 + James Yu 3.87 + Mandar Sahastrabuddhe 3.88 + Google Inc. 3.89 + Vadim Barkov 3.90 3.91 and with the following additions to the disclaimer: 3.92 3.93 - There is no warranty against interference with your enjoyment of the 3.94 - library or against infringement. There is no warranty that our 3.95 - efforts or the library will fulfill any of your particular purposes 3.96 - or needs. This library is provided with all faults, and the entire 3.97 - risk of satisfactory quality, performance, accuracy, and effort is with 3.98 - the user. 3.99 + There is no warranty against interference with your enjoyment of 3.100 + the library or against infringement. There is no warranty that our 3.101 + efforts or the library will fulfill any of your particular purposes 3.102 + or needs. This library is provided with all faults, and the entire 3.103 + risk of satisfactory quality, performance, accuracy, and effort is 3.104 + with the user. 3.105 3.106 Some files in the "contrib" directory and some configure-generated 3.107 -files that are distributed with libpng have other copyright owners and 3.108 +files that are distributed with libpng have other copyright owners, and 3.109 are released under other open source licenses. 3.110 3.111 libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are 3.112 Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from 3.113 libpng-0.96, and are distributed according to the same disclaimer and 3.114 -license as libpng-0.96, with the following individuals added to the list 3.115 -of Contributing Authors: 3.116 - 3.117 - Tom Lane 3.118 - Glenn Randers-Pehrson 3.119 - Willem van Schaik 3.120 +license as libpng-0.96, with the following individuals added to the 3.121 +list of Contributing Authors: 3.122 + 3.123 + Tom Lane 3.124 + Glenn Randers-Pehrson 3.125 + Willem van Schaik 3.126 3.127 libpng versions 0.89, June 1996, through 0.96, May 1997, are 3.128 Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, 3.129 @@ -1531,14 +1561,14 @@ 3.130 libpng-0.88, with the following individuals added to the list of 3.131 Contributing Authors: 3.132 3.133 - John Bowler 3.134 - Kevin Bracey 3.135 - Sam Bushell 3.136 - Magnus Holmgren 3.137 - Greg Roelofs 3.138 - Tom Tanner 3.139 - 3.140 -Some files in the "scripts" directory have other copyright owners 3.141 + John Bowler 3.142 + Kevin Bracey 3.143 + Sam Bushell 3.144 + Magnus Holmgren 3.145 + Greg Roelofs 3.146 + Tom Tanner 3.147 + 3.148 +Some files in the "scripts" directory have other copyright owners, 3.149 but are released under this license. 3.150 3.151 libpng versions 0.5, May 1995, through 0.88, January 1996, are 3.152 @@ -1547,39 +1577,38 @@ 3.153 For the purposes of this copyright and license, "Contributing Authors" 3.154 is defined as the following set of individuals: 3.155 3.156 - Andreas Dilger 3.157 - Dave Martindale 3.158 - Guy Eric Schalnat 3.159 - Paul Schmidt 3.160 - Tim Wegner 3.161 - 3.162 -The PNG Reference Library is supplied "AS IS". The Contributing Authors 3.163 -and Group 42, Inc. disclaim all warranties, expressed or implied, 3.164 -including, without limitation, the warranties of merchantability and of 3.165 -fitness for any purpose. The Contributing Authors and Group 42, Inc. 3.166 -assume no liability for direct, indirect, incidental, special, exemplary, 3.167 -or consequential damages, which may result from the use of the PNG 3.168 -Reference Library, even if advised of the possibility of such damage. 3.169 + Andreas Dilger 3.170 + Dave Martindale 3.171 + Guy Eric Schalnat 3.172 + Paul Schmidt 3.173 + Tim Wegner 3.174 + 3.175 +The PNG Reference Library is supplied "AS IS". The Contributing 3.176 +Authors and Group 42, Inc. disclaim all warranties, expressed or 3.177 +implied, including, without limitation, the warranties of 3.178 +merchantability and of fitness for any purpose. The Contributing 3.179 +Authors and Group 42, Inc. assume no liability for direct, indirect, 3.180 +incidental, special, exemplary, or consequential damages, which may 3.181 +result from the use of the PNG Reference Library, even if advised of 3.182 +the possibility of such damage. 3.183 3.184 Permission is hereby granted to use, copy, modify, and distribute this 3.185 source code, or portions hereof, for any purpose, without fee, subject 3.186 to the following restrictions: 3.187 3.188 - 1. The origin of this source code must not be misrepresented. 3.189 - 3.190 - 2. Altered versions must be plainly marked as such and must not 3.191 - be misrepresented as being the original source. 3.192 - 3.193 - 3. This Copyright notice may not be removed or altered from any 3.194 - source or altered source distribution. 3.195 - 3.196 -The Contributing Authors and Group 42, Inc. specifically permit, without 3.197 -fee, and encourage the use of this source code as a component to 3.198 -supporting the PNG file format in commercial products. If you use this 3.199 -source code in a product, acknowledgment is not required but would be 3.200 -appreciated. 3.201 - 3.202 -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. 3.203 + 1. The origin of this source code must not be misrepresented. 3.204 + 3.205 + 2. Altered versions must be plainly marked as such and must not 3.206 + be misrepresented as being the original source. 3.207 + 3.208 + 3. This Copyright notice may not be removed or altered from any 3.209 + source or altered source distribution. 3.210 + 3.211 +The Contributing Authors and Group 42, Inc. specifically permit, 3.212 +without fee, and encourage the use of this source code as a component 3.213 +to supporting the PNG file format in commercial products. If you use 3.214 +this source code in a product, acknowledgment is not required but would 3.215 +be appreciated. 3.216 3.217 TRADEMARK: 3.218 3.219 @@ -2101,13 +2130,13 @@ 3.220 3.221 ------------------------------------------------------------------------------- 3.222 3.223 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, 3.224 +%% This notice is provided with respect to PC/SC Lite v1.8.24, 3.225 which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. 3.226 3.227 --- begin of LICENSE --- 3.228 3.229 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com> 3.230 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> 3.231 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com> 3.232 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr> 3.233 All rights reserved. 3.234 3.235 Redistribution and use in source and binary forms, with or without 3.236 @@ -2119,15 +2148,10 @@ 3.237 2. Redistributions in binary form must reproduce the above copyright 3.238 notice, this list of conditions and the following disclaimer in the 3.239 documentation and/or other materials provided with the distribution. 3.240 -3. All advertising materials mentioning features or use of this software 3.241 - must display the following acknowledgement: 3.242 - This product includes software developed by: 3.243 - David Corcoran <corcoran@linuxnet.com> 3.244 - http://www.linuxnet.com (MUSCLE) 3.245 -4. The name of the author may not be used to endorse or promote products 3.246 +3. The name of the author may not be used to endorse or promote products 3.247 derived from this software without specific prior written permission. 3.248 3.249 -Changes to this license can be made only by the copyright author with 3.250 +Changes to this license can be made only by the copyright author with 3.251 explicit written consent. 3.252 3.253 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
4.1 --- a/common/autoconf/build-performance.m4 Sat Nov 09 20:15:27 2019 +0800 4.2 +++ b/common/autoconf/build-performance.m4 Sat Nov 09 20:29:44 2019 +0800 4.3 @@ -1,5 +1,5 @@ 4.4 # 4.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. 4.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 4.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 # 4.9 # This code is free software; you can redistribute it and/or modify it 4.10 @@ -42,8 +42,11 @@ 4.11 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` 4.12 FOUND_CORES=yes 4.13 elif test "x$OPENJDK_BUILD_OS" = xaix ; then 4.14 - NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` 4.15 - FOUND_CORES=yes 4.16 + NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2` 4.17 + if test -n "$NUM_LCPU"; then 4.18 + NUM_CORES=$NUM_LCPU 4.19 + FOUND_CORES=yes 4.20 + fi 4.21 elif test -n "$NUMBER_OF_PROCESSORS"; then 4.22 # On windows, look in the env 4.23 NUM_CORES=$NUMBER_OF_PROCESSORS
5.1 --- a/common/autoconf/flags.m4 Sat Nov 09 20:15:27 2019 +0800 5.2 +++ b/common/autoconf/flags.m4 Sat Nov 09 20:29:44 2019 +0800 5.3 @@ -388,16 +388,8 @@ 5.4 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" 5.5 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" 5.6 elif test "x$TOOLCHAIN_TYPE" = xgcc; then 5.7 - case $OPENJDK_TARGET_CPU_ARCH in 5.8 - x86 ) 5.9 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 5.10 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 5.11 - ;; 5.12 - x86_64 ) 5.13 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 5.14 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 5.15 - ;; 5.16 - esac 5.17 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 5.18 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 5.19 if test "x$OPENJDK_TARGET_OS" != xmacosx; then 5.20 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" 5.21 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" 5.22 @@ -456,7 +448,7 @@ 5.23 if test "x$TOOLCHAIN_TYPE" = xgcc; then 5.24 # these options are used for both C and C++ compiles 5.25 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ 5.26 - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" 5.27 + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" 5.28 case $OPENJDK_TARGET_CPU_ARCH in 5.29 arm ) 5.30 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing 5.31 @@ -465,10 +457,6 @@ 5.32 ppc ) 5.33 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing 5.34 ;; 5.35 - x86 ) 5.36 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" 5.37 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" 5.38 - ;; 5.39 * ) 5.40 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" 5.41 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
6.1 --- a/common/autoconf/generated-configure.sh Sat Nov 09 20:15:27 2019 +0800 6.2 +++ b/common/autoconf/generated-configure.sh Sat Nov 09 20:29:44 2019 +0800 6.3 @@ -3650,7 +3650,7 @@ 6.4 6.5 6.6 # 6.7 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. 6.8 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. 6.9 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.10 # 6.11 # This code is free software; you can redistribute it and/or modify it 6.12 @@ -4385,7 +4385,7 @@ 6.13 #CUSTOM_AUTOCONF_INCLUDE 6.14 6.15 # Do not change or remove the following line, it is needed for consistency checks: 6.16 -DATE_WHEN_GENERATED=1556533111 6.17 +DATE_WHEN_GENERATED=1565358475 6.18 6.19 ############################################################################### 6.20 # 6.21 @@ -41504,16 +41504,8 @@ 6.22 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" 6.23 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" 6.24 elif test "x$TOOLCHAIN_TYPE" = xgcc; then 6.25 - case $OPENJDK_TARGET_CPU_ARCH in 6.26 - x86 ) 6.27 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 6.28 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 6.29 - ;; 6.30 - x86_64 ) 6.31 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 6.32 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 6.33 - ;; 6.34 - esac 6.35 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" 6.36 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" 6.37 if test "x$OPENJDK_TARGET_OS" != xmacosx; then 6.38 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" 6.39 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" 6.40 @@ -41624,7 +41616,7 @@ 6.41 if test "x$TOOLCHAIN_TYPE" = xgcc; then 6.42 # these options are used for both C and C++ compiles 6.43 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \ 6.44 - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" 6.45 + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" 6.46 case $OPENJDK_TARGET_CPU_ARCH in 6.47 arm ) 6.48 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing 6.49 @@ -41633,10 +41625,6 @@ 6.50 ppc ) 6.51 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing 6.52 ;; 6.53 - x86 ) 6.54 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" 6.55 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" 6.56 - ;; 6.57 * ) 6.58 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" 6.59 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" 6.60 @@ -52062,8 +52050,11 @@ 6.61 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` 6.62 FOUND_CORES=yes 6.63 elif test "x$OPENJDK_BUILD_OS" = xaix ; then 6.64 - NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` 6.65 - FOUND_CORES=yes 6.66 + NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[0-9]*" | $CUT -d "=" -f 2` 6.67 + if test -n "$NUM_LCPU"; then 6.68 + NUM_CORES=$NUM_LCPU 6.69 + FOUND_CORES=yes 6.70 + fi 6.71 elif test -n "$NUMBER_OF_PROCESSORS"; then 6.72 # On windows, look in the env 6.73 NUM_CORES=$NUMBER_OF_PROCESSORS
7.1 --- a/make/Main.gmk Sat Nov 09 20:15:27 2019 +0800 7.2 +++ b/make/Main.gmk Sat Nov 09 20:29:44 2019 +0800 7.3 @@ -172,11 +172,17 @@ 7.4 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image 7.5 @($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) 7.6 7.7 +# If the tests produced a $(TEST)_exitcode.txt file, use the number in that 7.8 +# file for the exit code of the "make test" invocation. 7.9 test: images test-only 7.10 test-only: start-make 7.11 @$(call TargetEnter) 7.12 @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true 7.13 @$(call TargetExit) 7.14 + @(if [ -r $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt ]; then \ 7.15 + EXIT=$$($(CAT) $(OUTPUT_ROOT)/testoutput/$(TEST)_exitcode.txt); \ 7.16 + exit $${EXIT}; \ 7.17 + fi) 7.18 7.19 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 7.20 # used to track the exact sources used to build that image.
8.1 --- a/test/Makefile Sat Nov 09 20:15:27 2019 +0800 8.2 +++ b/test/Makefile Sat Nov 09 20:29:44 2019 +0800 8.3 @@ -50,6 +50,22 @@ 8.4 fi 8.5 endef 8.6 8.7 +# Macro to print a summary for a given test subdirectory 8.8 +define SUBDIR_SUMMARY # subdirectory to print summary 8.9 +if [ -d $1 ] ; then \ 8.10 + if [ -r $1/Stats.txt ] ; then \ 8.11 + cat $1/Stats.txt; \ 8.12 + echo ""; \ 8.13 + else \ 8.14 + echo "ERROR: File does not exist: $1/Stats.txt"; \ 8.15 + exit 1; \ 8.16 + fi; \ 8.17 +else \ 8.18 + echo "WARNING: Expected directory does not exist: $1"; \ 8.19 + echo " Test summary might be incorrect."; \ 8.20 +fi 8.21 +endef 8.22 + 8.23 # Default test target (core) 8.24 default: jdk_core langtools_jtreg 8.25 8.26 @@ -58,7 +74,7 @@ 8.27 8.28 # Test targets 8.29 langtools_% : 8.30 - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) 8.31 + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) UNIQUE_DIR="$@" TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) 8.32 8.33 jdk_% core_%s svc_%: 8.34 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) 8.35 @@ -66,6 +82,35 @@ 8.36 hotspot_%: 8.37 @$(NO_STOPPING)$(call SUBDIR_TEST, $(HOTSPOT_DIR), TEST="$@" $@) 8.38 8.39 +# Variables for tier1 testing 8.40 +TIER1_TESTOUTPUT="$(ALT_OUTPUTDIR)/testoutput" 8.41 +TIER1_STATUS_FILE="$(TIER1_TESTOUTPUT)/tier1_exitcode.txt" 8.42 + 8.43 +# Note: Test failures are handled via summary_tier1 as the 8.44 +# tier1 targets are never aborted even if tests fail. 8.45 +tier1: prep_tier1 jdk_tier1 langtools_tier1 hotspot_tier1 summary_tier1 8.46 + 8.47 +prep_tier1: 8.48 + @rm -rf $(TIER1_STATUS_FILE) 8.49 + 8.50 +# This relies on jdk_tier1, langtools_tier1, hotspot_tier1 producing 8.51 +# Stats.txt (summary) and exitcode.txt files. 8.52 +summary_tier1: 8.53 + @(EXIT_VAL=0; \ 8.54 + echo ""; \ 8.55 + echo "-------------- Test Summary ------------"; \ 8.56 + echo ""; \ 8.57 + for test_dir in $$(find "$(ALT_OUTPUTDIR)" -type d -name \*_tier1); do \ 8.58 + $(call SUBDIR_SUMMARY, $${test_dir}); \ 8.59 + EXIT_VAL=$$(expr $${EXIT_VAL} + $$(cat $${test_dir}/exitcode.txt)); \ 8.60 + done; \ 8.61 + echo $${EXIT_VAL} > $(TIER1_STATUS_FILE); \ 8.62 + echo "For details see:"; \ 8.63 + echo $(TIER1_TESTOUTPUT); \ 8.64 + echo ""; \ 8.65 + echo "-------------- Test Summary ------------"; \ 8.66 + echo "") 8.67 + 8.68 # 8.69 # jtreg_tests 8.70 # 8.71 @@ -95,6 +140,6 @@ 8.72 ################################################################ 8.73 8.74 # Phony targets (e.g. these are not filenames) 8.75 -.PHONY: all clean 8.76 +.PHONY: all clean summary_tier1 prep_tier1 8.77 8.78 ################################################################
