1.1 --- a/common/autoconf/generated-configure.sh Thu Sep 05 10:58:25 2013 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Thu Sep 12 12:29:17 2013 -0700
1.3 @@ -710,7 +710,6 @@
1.4 SHARED_LIBRARY
1.5 OBJ_SUFFIX
1.6 COMPILER_NAME
1.7 -TARGET_BITS_FLAG
1.8 JT_HOME
1.9 JTREGEXE
1.10 LIPO
1.11 @@ -752,6 +751,7 @@
1.12 PROPER_COMPILER_CXX
1.13 POTENTIAL_CXX
1.14 TOOLS_DIR_CXX
1.15 +COMPILER_TARGET_BITS_FLAG
1.16 OBJEXT
1.17 EXEEXT
1.18 ac_ct_CC
1.19 @@ -3450,8 +3450,6 @@
1.20 PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
1.21 make)
1.22 PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
1.23 - * )
1.24 - break ;;
1.25 esac
1.26 }
1.27
1.28 @@ -3473,8 +3471,6 @@
1.29 PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.30 ccache)
1.31 PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.32 - * )
1.33 - break ;;
1.34 esac
1.35 }
1.36
1.37 @@ -3496,8 +3492,6 @@
1.38 PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.39 ccache)
1.40 PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.41 - * )
1.42 - break ;;
1.43 esac
1.44 }
1.45
1.46 @@ -3826,7 +3820,7 @@
1.47 #CUSTOM_AUTOCONF_INCLUDE
1.48
1.49 # Do not change or remove the following line, it is needed for consistency checks:
1.50 -DATE_WHEN_GENERATED=1378403883
1.51 +DATE_WHEN_GENERATED=1379014108
1.52
1.53 ###############################################################################
1.54 #
1.55 @@ -6745,6 +6739,11 @@
1.56 VAR_OS_API=winapi
1.57 VAR_OS_ENV=windows.msys
1.58 ;;
1.59 + *aix*)
1.60 + VAR_OS=aix
1.61 + VAR_OS_API=posix
1.62 + VAR_OS_ENV=aix
1.63 + ;;
1.64 *)
1.65 as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5
1.66 ;;
1.67 @@ -6853,6 +6852,11 @@
1.68 VAR_OS_API=winapi
1.69 VAR_OS_ENV=windows.msys
1.70 ;;
1.71 + *aix*)
1.72 + VAR_OS=aix
1.73 + VAR_OS_API=posix
1.74 + VAR_OS_ENV=aix
1.75 + ;;
1.76 *)
1.77 as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5
1.78 ;;
1.79 @@ -15749,7 +15753,7 @@
1.80 case $PKGHANDLER in
1.81 apt-get)
1.82 apt_help $MISSING_DEPENDENCY ;;
1.83 - yum)
1.84 + yum)
1.85 yum_help $MISSING_DEPENDENCY ;;
1.86 port)
1.87 port_help $MISSING_DEPENDENCY ;;
1.88 @@ -15757,8 +15761,6 @@
1.89 pkgutil_help $MISSING_DEPENDENCY ;;
1.90 pkgadd)
1.91 pkgadd_help $MISSING_DEPENDENCY ;;
1.92 - * )
1.93 - break ;;
1.94 esac
1.95
1.96 if test "x$PKGHANDLER_COMMAND" != x; then
1.97 @@ -19177,6 +19179,9 @@
1.98 COMPILER_CHECK_LIST="cl"
1.99 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.100 COMPILER_CHECK_LIST="cc gcc"
1.101 +elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.102 + # Do not probe for cc on AIX.
1.103 + COMPILER_CHECK_LIST="xlc_r"
1.104 else
1.105 COMPILER_CHECK_LIST="gcc cc"
1.106 fi
1.107 @@ -19300,7 +19305,7 @@
1.108 case $PKGHANDLER in
1.109 apt-get)
1.110 apt_help $MISSING_DEPENDENCY ;;
1.111 - yum)
1.112 + yum)
1.113 yum_help $MISSING_DEPENDENCY ;;
1.114 port)
1.115 port_help $MISSING_DEPENDENCY ;;
1.116 @@ -19308,8 +19313,6 @@
1.117 pkgutil_help $MISSING_DEPENDENCY ;;
1.118 pkgadd)
1.119 pkgadd_help $MISSING_DEPENDENCY ;;
1.120 - * )
1.121 - break ;;
1.122 esac
1.123
1.124 if test "x$PKGHANDLER_COMMAND" != x; then
1.125 @@ -19584,9 +19587,12 @@
1.126 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;}
1.127 fi
1.128
1.129 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.130 + TEST_COMPILER="$CC"
1.131 + # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.132 + # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.133 + if test "x$OPENJDK_BUILD_OS" != xaix; then
1.134 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.135 $as_echo_n "checking resolved symbolic links for CC... " >&6; }
1.136 - TEST_COMPILER="$CC"
1.137
1.138 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.139 # Follow a chain of symbolic links. Use readlink
1.140 @@ -19635,8 +19641,9 @@
1.141 fi
1.142 fi
1.143
1.144 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.145 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.146 $as_echo "$TEST_COMPILER" >&6; }
1.147 + fi
1.148 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC is disguised ccache" >&5
1.149 $as_echo_n "checking if CC is disguised ccache... " >&6; }
1.150
1.151 @@ -20100,6 +20107,15 @@
1.152 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
1.153 COMPILER_VENDOR="Sun Studio"
1.154 fi
1.155 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.156 + COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1`
1.157 + $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
1.158 + if test $? -ne 0; then
1.159 + as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
1.160 + else
1.161 + COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
1.162 + COMPILER_VENDOR='IBM'
1.163 + fi
1.164 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.165 # First line typically looks something like:
1.166 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.167 @@ -20741,6 +20757,14 @@
1.168 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.169
1.170
1.171 +# Option used to tell the compiler whether to create 32- or 64-bit executables
1.172 +# Notice that CC contains the full compiler path at this point.
1.173 +case $CC in
1.174 + *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
1.175 + *) COMPILER_TARGET_BITS_FLAG="-m";;
1.176 +esac
1.177 +
1.178 +
1.179 ### Locate C++ compiler (CXX)
1.180
1.181 if test "x$CXX" != x; then
1.182 @@ -20749,6 +20773,9 @@
1.183 COMPILER_CHECK_LIST="cl"
1.184 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.185 COMPILER_CHECK_LIST="CC g++"
1.186 +elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.187 + # Do not probe for CC on AIX .
1.188 + COMPILER_CHECK_LIST="xlC_r"
1.189 else
1.190 COMPILER_CHECK_LIST="g++ CC"
1.191 fi
1.192 @@ -20872,7 +20899,7 @@
1.193 case $PKGHANDLER in
1.194 apt-get)
1.195 apt_help $MISSING_DEPENDENCY ;;
1.196 - yum)
1.197 + yum)
1.198 yum_help $MISSING_DEPENDENCY ;;
1.199 port)
1.200 port_help $MISSING_DEPENDENCY ;;
1.201 @@ -20880,8 +20907,6 @@
1.202 pkgutil_help $MISSING_DEPENDENCY ;;
1.203 pkgadd)
1.204 pkgadd_help $MISSING_DEPENDENCY ;;
1.205 - * )
1.206 - break ;;
1.207 esac
1.208
1.209 if test "x$PKGHANDLER_COMMAND" != x; then
1.210 @@ -21156,9 +21181,12 @@
1.211 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;}
1.212 fi
1.213
1.214 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.215 + TEST_COMPILER="$CXX"
1.216 + # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.217 + # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.218 + if test "x$OPENJDK_BUILD_OS" != xaix; then
1.219 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.220 $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
1.221 - TEST_COMPILER="$CXX"
1.222
1.223 if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.224 # Follow a chain of symbolic links. Use readlink
1.225 @@ -21207,8 +21235,9 @@
1.226 fi
1.227 fi
1.228
1.229 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.230 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_COMPILER" >&5
1.231 $as_echo "$TEST_COMPILER" >&6; }
1.232 + fi
1.233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CXX is disguised ccache" >&5
1.234 $as_echo_n "checking if CXX is disguised ccache... " >&6; }
1.235
1.236 @@ -21672,6 +21701,15 @@
1.237 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
1.238 COMPILER_VENDOR="Sun Studio"
1.239 fi
1.240 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.241 + COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1`
1.242 + $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
1.243 + if test $? -ne 0; then
1.244 + as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
1.245 + else
1.246 + COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
1.247 + COMPILER_VENDOR='IBM'
1.248 + fi
1.249 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.250 # First line typically looks something like:
1.251 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.252 @@ -22877,6 +22915,8 @@
1.253 fi
1.254 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.255 ARFLAGS="-r"
1.256 +elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.257 + ARFLAGS="-X64"
1.258 else
1.259 ARFLAGS=""
1.260 fi
1.261 @@ -28852,21 +28892,23 @@
1.262 # is made at runtime.)
1.263 #
1.264
1.265 -if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.266 - # Always specify -m flags on Solaris
1.267 +if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then
1.268 + # Always specify -m flag on Solaris
1.269 + # And -q on AIX because otherwise the compiler produces 32-bit objects by default
1.270
1.271 # keep track of c/cxx flags that we added outselves...
1.272 # to prevent emitting warning...
1.273 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.274 -
1.275 -
1.276 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.277 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.278 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.279 -
1.280 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.281 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.282 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.283 + ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.284 + ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.285 + ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.286 +
1.287 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.288 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.289 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.290 +
1.291 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.292 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.293 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.294
1.295 elif test "x$COMPILE_TYPE" = xreduced; then
1.296 if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.297 @@ -28874,16 +28916,17 @@
1.298
1.299 # keep track of c/cxx flags that we added outselves...
1.300 # to prevent emitting warning...
1.301 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.302 -
1.303 -
1.304 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.305 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.306 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.307 -
1.308 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.309 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.310 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.311 + ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.312 + ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.313 + ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.314 +
1.315 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.316 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.317 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.318 +
1.319 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.320 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.321 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.322
1.323 fi
1.324 fi
1.325 @@ -28949,20 +28992,83 @@
1.326
1.327
1.328
1.329 -if test "x$SIZEOF_INT_P" != "x$ac_cv_sizeof_int_p"; then
1.330 - # Workaround autoconf bug, see http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html
1.331 - SIZEOF_INT_P="$ac_cv_sizeof_int_p"
1.332 -fi
1.333 -
1.334 -if test "x$SIZEOF_INT_P" = x; then
1.335 +# AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*'
1.336 +if test "x$ac_cv_sizeof_int_p" = x; then
1.337 # The test failed, lets stick to the assumed value.
1.338 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&5
1.339 $as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;}
1.340 else
1.341 - TESTED_TARGET_CPU_BITS=`expr 8 \* $SIZEOF_INT_P`
1.342 + TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
1.343
1.344 if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
1.345 - as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5
1.346 + # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects
1.347 + # Let's try to implicitely set the compilers target architecture and retry the test
1.348 + { $as_echo "$as_me:${as_lineno-$LINENO}: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&5
1.349 +$as_echo "$as_me: The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)." >&6;}
1.350 + { $as_echo "$as_me:${as_lineno-$LINENO}: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&5
1.351 +$as_echo "$as_me: I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" >&6;}
1.352 +
1.353 + # keep track of c/cxx flags that we added outselves...
1.354 + # to prevent emitting warning...
1.355 + ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.356 + ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.357 + ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.358 +
1.359 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.360 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.361 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.362 +
1.363 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.364 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.365 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.366 +
1.367 +
1.368 + # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value!
1.369 + unset ac_cv_sizeof_int_p
1.370 + # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF
1.371 + cat >>confdefs.h <<_ACEOF
1.372 +#undef SIZEOF_INT_P
1.373 +_ACEOF
1.374 +
1.375 + # The cast to long int works around a bug in the HP C Compiler
1.376 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
1.377 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
1.378 +# This bug is HP SR number 8606223364.
1.379 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
1.380 +$as_echo_n "checking size of int *... " >&6; }
1.381 +if ${ac_cv_sizeof_int_p+:} false; then :
1.382 + $as_echo_n "(cached) " >&6
1.383 +else
1.384 + if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
1.385 +
1.386 +else
1.387 + if test "$ac_cv_type_int_p" = yes; then
1.388 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.389 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.390 +as_fn_error 77 "cannot compute sizeof (int *)
1.391 +See \`config.log' for more details" "$LINENO" 5; }
1.392 + else
1.393 + ac_cv_sizeof_int_p=0
1.394 + fi
1.395 +fi
1.396 +
1.397 +fi
1.398 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
1.399 +$as_echo "$ac_cv_sizeof_int_p" >&6; }
1.400 +
1.401 +
1.402 +
1.403 +cat >>confdefs.h <<_ACEOF
1.404 +#define SIZEOF_INT_P $ac_cv_sizeof_int_p
1.405 +_ACEOF
1.406 +
1.407 +
1.408 +
1.409 + TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
1.410 +
1.411 + if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
1.412 + as_fn_error $? "The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)" "$LINENO" 5
1.413 + fi
1.414 fi
1.415 fi
1.416
1.417 @@ -29275,6 +29381,29 @@
1.418 POST_STRIP_CMD="$STRIP -x"
1.419 POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.420 fi
1.421 + if test "x$OPENJDK_TARGET_OS" = xaix; then
1.422 + COMPILER_NAME=xlc
1.423 + PICFLAG="-qpic=large"
1.424 + LIBRARY_PREFIX=lib
1.425 + SHARED_LIBRARY='lib$1.so'
1.426 + STATIC_LIBRARY='lib$1.a'
1.427 + SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.428 + SHARED_LIBRARY_SUFFIX='.so'
1.429 + STATIC_LIBRARY_SUFFIX='.a'
1.430 + OBJ_SUFFIX='.o'
1.431 + EXE_SUFFIX=''
1.432 + SET_SHARED_LIBRARY_NAME=''
1.433 + SET_SHARED_LIBRARY_MAPFILE=''
1.434 + C_FLAG_REORDER=''
1.435 + CXX_FLAG_REORDER=''
1.436 + SET_SHARED_LIBRARY_ORIGIN=''
1.437 + SET_EXECUTABLE_ORIGIN=""
1.438 + CFLAGS_JDK=""
1.439 + CXXFLAGS_JDK=""
1.440 + CFLAGS_JDKLIB_EXTRA=''
1.441 + POST_STRIP_CMD="$STRIP -X32_64"
1.442 + POST_MCS_CMD=""
1.443 + fi
1.444 if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.445 # If it is not gcc, then assume it is the MS Visual Studio compiler
1.446 COMPILER_NAME=cl
1.447 @@ -29457,8 +29586,26 @@
1.448 ;;
1.449 esac
1.450
1.451 - CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.452 - CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.453 + CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.454 + CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.455 + ;;
1.456 + xlc )
1.457 + C_FLAG_DEPS="-qmakedep=gcc -MF"
1.458 + CXX_FLAG_DEPS="-qmakedep=gcc -MF"
1.459 + C_O_FLAG_HIGHEST="-O3"
1.460 + C_O_FLAG_HI="-O3 -qstrict"
1.461 + C_O_FLAG_NORM="-O2"
1.462 + C_O_FLAG_NONE=""
1.463 + CXX_O_FLAG_HIGHEST="-O3"
1.464 + CXX_O_FLAG_HI="-O3 -qstrict"
1.465 + CXX_O_FLAG_NORM="-O2"
1.466 + CXX_O_FLAG_NONE=""
1.467 + CFLAGS_DEBUG_SYMBOLS="-g"
1.468 + CXXFLAGS_DEBUG_SYMBOLS="-g"
1.469 + LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
1.470 + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.471 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.472 + ;;
1.473 esac
1.474 ;;
1.475 CL )
1.476 @@ -29582,6 +29729,13 @@
1.477 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.478 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.479 ;;
1.480 + xlc )
1.481 + CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.482 + CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.483 +
1.484 + LDFLAGS_JDK="$LDFLAGS_JDK"
1.485 + LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
1.486 + ;;
1.487 cl )
1.488 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.489 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.490 @@ -29651,6 +29805,9 @@
1.491 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.492 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
1.493 fi
1.494 +if test "x$OPENJDK_TARGET_OS" = xaix; then
1.495 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DAIX -DPPC64"
1.496 +fi
1.497 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.498 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.499 # Setting these parameters makes it an error to link to macosx APIs that are
1.500 @@ -29783,10 +29940,10 @@
1.501 # ZERO_ARCHFLAG tells the compiler which mode to build for
1.502 case "${OPENJDK_TARGET_CPU}" in
1.503 s390)
1.504 - ZERO_ARCHFLAG="-m31"
1.505 + ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
1.506 ;;
1.507 *)
1.508 - ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.509 + ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.510 esac
1.511
1.512 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"$ZERO_ARCHFLAG\"" >&5
1.513 @@ -29859,15 +30016,15 @@
1.514
1.515
1.516
1.517 - # Check that the compiler supports -mX flags
1.518 + # Check that the compiler supports -mX (or -qX on AIX) flags
1.519 # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
1.520
1.521 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"" >&5
1.522 -$as_echo_n "checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
1.523 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5
1.524 +$as_echo_n "checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
1.525 supports=yes
1.526
1.527 saved_cflags="$CFLAGS"
1.528 - CFLAGS="$CFLAGS -m${OPENJDK_TARGET_CPU_BITS}"
1.529 + CFLAGS="$CFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.530 ac_ext=c
1.531 ac_cpp='$CPP $CPPFLAGS'
1.532 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.533 @@ -29895,7 +30052,7 @@
1.534 CFLAGS="$saved_cflags"
1.535
1.536 saved_cxxflags="$CXXFLAGS"
1.537 - CXXFLAGS="$CXXFLAG -m${OPENJDK_TARGET_CPU_BITS}"
1.538 + CXXFLAGS="$CXXFLAG ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
1.539 ac_ext=cpp
1.540 ac_cpp='$CXXCPP $CPPFLAGS'
1.541 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.542 @@ -30050,6 +30207,16 @@
1.543 $as_echo "alsa pulse" >&6; }
1.544 fi
1.545
1.546 +if test "x$OPENJDK_TARGET_OS" = xaix; then
1.547 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on AIX?" >&5
1.548 +$as_echo_n "checking what is not needed on AIX?... " >&6; }
1.549 + ALSA_NOT_NEEDED=yes
1.550 + PULSE_NOT_NEEDED=yes
1.551 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
1.552 +$as_echo "alsa pulse" >&6; }
1.553 +fi
1.554 +
1.555 +
1.556 if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5
1.558 $as_echo_n "checking what is not needed on Windows?... " >&6; }
1.559 @@ -30860,7 +31027,7 @@
1.560 case $PKGHANDLER in
1.561 apt-get)
1.562 apt_help $MISSING_DEPENDENCY ;;
1.563 - yum)
1.564 + yum)
1.565 yum_help $MISSING_DEPENDENCY ;;
1.566 port)
1.567 port_help $MISSING_DEPENDENCY ;;
1.568 @@ -30868,8 +31035,6 @@
1.569 pkgutil_help $MISSING_DEPENDENCY ;;
1.570 pkgadd)
1.571 pkgadd_help $MISSING_DEPENDENCY ;;
1.572 - * )
1.573 - break ;;
1.574 esac
1.575
1.576 if test "x$PKGHANDLER_COMMAND" != x; then
1.577 @@ -30953,7 +31118,7 @@
1.578 case $PKGHANDLER in
1.579 apt-get)
1.580 apt_help $MISSING_DEPENDENCY ;;
1.581 - yum)
1.582 + yum)
1.583 yum_help $MISSING_DEPENDENCY ;;
1.584 port)
1.585 port_help $MISSING_DEPENDENCY ;;
1.586 @@ -30961,8 +31126,6 @@
1.587 pkgutil_help $MISSING_DEPENDENCY ;;
1.588 pkgadd)
1.589 pkgadd_help $MISSING_DEPENDENCY ;;
1.590 - * )
1.591 - break ;;
1.592 esac
1.593
1.594 if test "x$PKGHANDLER_COMMAND" != x; then
1.595 @@ -31205,7 +31368,7 @@
1.596 case $PKGHANDLER in
1.597 apt-get)
1.598 apt_help $MISSING_DEPENDENCY ;;
1.599 - yum)
1.600 + yum)
1.601 yum_help $MISSING_DEPENDENCY ;;
1.602 port)
1.603 port_help $MISSING_DEPENDENCY ;;
1.604 @@ -31213,8 +31376,6 @@
1.605 pkgutil_help $MISSING_DEPENDENCY ;;
1.606 pkgadd)
1.607 pkgadd_help $MISSING_DEPENDENCY ;;
1.608 - * )
1.609 - break ;;
1.610 esac
1.611
1.612 if test "x$PKGHANDLER_COMMAND" != x; then
1.613 @@ -31828,7 +31989,7 @@
1.614 case $PKGHANDLER in
1.615 apt-get)
1.616 apt_help $MISSING_DEPENDENCY ;;
1.617 - yum)
1.618 + yum)
1.619 yum_help $MISSING_DEPENDENCY ;;
1.620 port)
1.621 port_help $MISSING_DEPENDENCY ;;
1.622 @@ -31836,8 +31997,6 @@
1.623 pkgutil_help $MISSING_DEPENDENCY ;;
1.624 pkgadd)
1.625 pkgadd_help $MISSING_DEPENDENCY ;;
1.626 - * )
1.627 - break ;;
1.628 esac
1.629
1.630 if test "x$PKGHANDLER_COMMAND" != x; then
1.631 @@ -32200,7 +32359,7 @@
1.632 case $PKGHANDLER in
1.633 apt-get)
1.634 apt_help $MISSING_DEPENDENCY ;;
1.635 - yum)
1.636 + yum)
1.637 yum_help $MISSING_DEPENDENCY ;;
1.638 port)
1.639 port_help $MISSING_DEPENDENCY ;;
1.640 @@ -32208,8 +32367,6 @@
1.641 pkgutil_help $MISSING_DEPENDENCY ;;
1.642 pkgadd)
1.643 pkgadd_help $MISSING_DEPENDENCY ;;
1.644 - * )
1.645 - break ;;
1.646 esac
1.647
1.648 if test "x$PKGHANDLER_COMMAND" != x; then
1.649 @@ -33073,6 +33230,9 @@
1.650 # Looks like a MacOSX system
1.651 NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'`
1.652 FOUND_CORES=yes
1.653 + elif test "x$OPENJDK_BUILD_OS" = xaix ; then
1.654 + NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'`
1.655 + FOUND_CORES=yes
1.656 elif test -n "$NUMBER_OF_PROCESSORS"; then
1.657 # On windows, look in the env
1.658 NUM_CORES=$NUMBER_OF_PROCESSORS
1.659 @@ -33118,8 +33278,8 @@
1.660 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
1.661 FOUND_MEM=yes
1.662 elif test -x /usr/sbin/prtconf; then
1.663 - # Looks like a Solaris system
1.664 - MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print $3 }'`
1.665 + # Looks like a Solaris or AIX system
1.666 + MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [Ss]ize" | awk '{ print $3 }'`
1.667 FOUND_MEM=yes
1.668 elif test -x /usr/sbin/system_profiler; then
1.669 # Looks like a MacOSX system
1.670 @@ -35013,7 +35173,7 @@
1.671 case $PKGHANDLER in
1.672 apt-get)
1.673 apt_help $MISSING_DEPENDENCY ;;
1.674 - yum)
1.675 + yum)
1.676 yum_help $MISSING_DEPENDENCY ;;
1.677 port)
1.678 port_help $MISSING_DEPENDENCY ;;
1.679 @@ -35021,8 +35181,6 @@
1.680 pkgutil_help $MISSING_DEPENDENCY ;;
1.681 pkgadd)
1.682 pkgadd_help $MISSING_DEPENDENCY ;;
1.683 - * )
1.684 - break ;;
1.685 esac
1.686
1.687 if test "x$PKGHANDLER_COMMAND" != x; then
