1.1 --- a/common/autoconf/generated-configure.sh Sat Nov 09 20:15:27 2019 +0800
1.2 +++ b/common/autoconf/generated-configure.sh Sat Nov 09 20:29:44 2019 +0800
1.3 @@ -3650,7 +3650,7 @@
1.4
1.5
1.6 #
1.7 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.8 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
1.9 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.10 #
1.11 # This code is free software; you can redistribute it and/or modify it
1.12 @@ -4385,7 +4385,7 @@
1.13 #CUSTOM_AUTOCONF_INCLUDE
1.14
1.15 # Do not change or remove the following line, it is needed for consistency checks:
1.16 -DATE_WHEN_GENERATED=1556533111
1.17 +DATE_WHEN_GENERATED=1565358475
1.18
1.19 ###############################################################################
1.20 #
1.21 @@ -41504,16 +41504,8 @@
1.22 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.23 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.24 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.25 - case $OPENJDK_TARGET_CPU_ARCH in
1.26 - x86 )
1.27 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.28 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.29 - ;;
1.30 - x86_64 )
1.31 - LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.32 - LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.33 - ;;
1.34 - esac
1.35 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.36 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.37 if test "x$OPENJDK_TARGET_OS" != xmacosx; then
1.38 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
1.39 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
1.40 @@ -41624,7 +41616,7 @@
1.41 if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.42 # these options are used for both C and C++ compiles
1.43 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
1.44 - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.45 + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.46 case $OPENJDK_TARGET_CPU_ARCH in
1.47 arm )
1.48 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.49 @@ -41633,10 +41625,6 @@
1.50 ppc )
1.51 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.52 ;;
1.53 - x86 )
1.54 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
1.55 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
1.56 - ;;
1.57 * )
1.58 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.59 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.60 @@ -52062,8 +52050,11 @@
1.61 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'`
1.62 FOUND_CORES=yes
1.63 elif test "x$OPENJDK_BUILD_OS" = xaix ; then
1.64 - NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'`
1.65 - FOUND_CORES=yes
1.66 + NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[0-9]*" | $CUT -d "=" -f 2`
1.67 + if test -n "$NUM_LCPU"; then
1.68 + NUM_CORES=$NUM_LCPU
1.69 + FOUND_CORES=yes
1.70 + fi
1.71 elif test -n "$NUMBER_OF_PROCESSORS"; then
1.72 # On windows, look in the env
1.73 NUM_CORES=$NUMBER_OF_PROCESSORS
