19582 CC="$new_complete" |
19585 CC="$new_complete" |
19583 { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5 |
19586 { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5 |
19584 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;} |
19587 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;} |
19585 fi |
19588 fi |
19586 |
19589 |
19587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5 |
19590 TEST_COMPILER="$CC" |
|
19591 # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links |
|
19592 # to 'xlc' but it is crucial that we invoke the compiler with the right name! |
|
19593 if test "x$OPENJDK_BUILD_OS" != xaix; then |
|
19594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5 |
19588 $as_echo_n "checking resolved symbolic links for CC... " >&6; } |
19595 $as_echo_n "checking resolved symbolic links for CC... " >&6; } |
19589 TEST_COMPILER="$CC" |
|
19590 |
19596 |
19591 if test "x$OPENJDK_BUILD_OS" != xwindows; then |
19597 if test "x$OPENJDK_BUILD_OS" != xwindows; then |
19592 # Follow a chain of symbolic links. Use readlink |
19598 # Follow a chain of symbolic links. Use readlink |
19593 # where it exists, else fall back to horribly |
19599 # where it exists, else fall back to horribly |
19594 # complicated shell code. |
19600 # complicated shell code. |
20098 as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5 |
20105 as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5 |
20099 else |
20106 else |
20100 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` |
20107 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` |
20101 COMPILER_VENDOR="Sun Studio" |
20108 COMPILER_VENDOR="Sun Studio" |
20102 fi |
20109 fi |
|
20110 elif test "x$OPENJDK_TARGET_OS" = xaix; then |
|
20111 COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1` |
|
20112 $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null |
|
20113 if test $? -ne 0; then |
|
20114 as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5 |
|
20115 else |
|
20116 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'` |
|
20117 COMPILER_VENDOR='IBM' |
|
20118 fi |
20103 elif test "x$OPENJDK_TARGET_OS" = xwindows; then |
20119 elif test "x$OPENJDK_TARGET_OS" = xwindows; then |
20104 # First line typically looks something like: |
20120 # First line typically looks something like: |
20105 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 |
20121 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 |
20106 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
20122 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
20107 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` |
20123 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` |
20739 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
20755 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
20740 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
20756 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
20741 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
20757 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
20742 |
20758 |
20743 |
20759 |
|
20760 # Option used to tell the compiler whether to create 32- or 64-bit executables |
|
20761 # Notice that CC contains the full compiler path at this point. |
|
20762 case $CC in |
|
20763 *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";; |
|
20764 *) COMPILER_TARGET_BITS_FLAG="-m";; |
|
20765 esac |
|
20766 |
|
20767 |
20744 ### Locate C++ compiler (CXX) |
20768 ### Locate C++ compiler (CXX) |
20745 |
20769 |
20746 if test "x$CXX" != x; then |
20770 if test "x$CXX" != x; then |
20747 COMPILER_CHECK_LIST="$CXX" |
20771 COMPILER_CHECK_LIST="$CXX" |
20748 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
20772 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
20749 COMPILER_CHECK_LIST="cl" |
20773 COMPILER_CHECK_LIST="cl" |
20750 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
20774 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
20751 COMPILER_CHECK_LIST="CC g++" |
20775 COMPILER_CHECK_LIST="CC g++" |
|
20776 elif test "x$OPENJDK_TARGET_OS" = "xaix"; then |
|
20777 # Do not probe for CC on AIX . |
|
20778 COMPILER_CHECK_LIST="xlC_r" |
20752 else |
20779 else |
20753 COMPILER_CHECK_LIST="g++ CC" |
20780 COMPILER_CHECK_LIST="g++ CC" |
20754 fi |
20781 fi |
20755 |
20782 |
20756 |
20783 |
21154 CXX="$new_complete" |
21179 CXX="$new_complete" |
21155 { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5 |
21180 { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5 |
21156 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;} |
21181 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;} |
21157 fi |
21182 fi |
21158 |
21183 |
21159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5 |
21184 TEST_COMPILER="$CXX" |
|
21185 # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links |
|
21186 # to 'xlc' but it is crucial that we invoke the compiler with the right name! |
|
21187 if test "x$OPENJDK_BUILD_OS" != xaix; then |
|
21188 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5 |
21160 $as_echo_n "checking resolved symbolic links for CXX... " >&6; } |
21189 $as_echo_n "checking resolved symbolic links for CXX... " >&6; } |
21161 TEST_COMPILER="$CXX" |
|
21162 |
21190 |
21163 if test "x$OPENJDK_BUILD_OS" != xwindows; then |
21191 if test "x$OPENJDK_BUILD_OS" != xwindows; then |
21164 # Follow a chain of symbolic links. Use readlink |
21192 # Follow a chain of symbolic links. Use readlink |
21165 # where it exists, else fall back to horribly |
21193 # where it exists, else fall back to horribly |
21166 # complicated shell code. |
21194 # complicated shell code. |
21670 as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5 |
21699 as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5 |
21671 else |
21700 else |
21672 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` |
21701 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` |
21673 COMPILER_VENDOR="Sun Studio" |
21702 COMPILER_VENDOR="Sun Studio" |
21674 fi |
21703 fi |
|
21704 elif test "x$OPENJDK_TARGET_OS" = xaix; then |
|
21705 COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1` |
|
21706 $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null |
|
21707 if test $? -ne 0; then |
|
21708 as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5 |
|
21709 else |
|
21710 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'` |
|
21711 COMPILER_VENDOR='IBM' |
|
21712 fi |
21675 elif test "x$OPENJDK_TARGET_OS" = xwindows; then |
21713 elif test "x$OPENJDK_TARGET_OS" = xwindows; then |
21676 # First line typically looks something like: |
21714 # First line typically looks something like: |
21677 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 |
21715 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 |
21678 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
21716 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
21679 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` |
21717 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` |
28850 # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code. |
28890 # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code. |
28851 # (The JVM can use 32 or 64 bit Java pointers but that decision |
28891 # (The JVM can use 32 or 64 bit Java pointers but that decision |
28852 # is made at runtime.) |
28892 # is made at runtime.) |
28853 # |
28893 # |
28854 |
28894 |
28855 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
28895 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then |
28856 # Always specify -m flags on Solaris |
28896 # Always specify -m flag on Solaris |
|
28897 # And -q on AIX because otherwise the compiler produces 32-bit objects by default |
28857 |
28898 |
28858 # keep track of c/cxx flags that we added outselves... |
28899 # keep track of c/cxx flags that we added outselves... |
28859 # to prevent emitting warning... |
28900 # to prevent emitting warning... |
28860 TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" |
28901 ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28861 |
28902 ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28862 |
28903 ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28863 CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" |
28904 |
28864 CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" |
28905 CFLAGS="${CFLAGS}${ADDED_CFLAGS}" |
28865 LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" |
28906 CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" |
28866 |
28907 LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" |
28867 CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28908 |
28868 CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28909 CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" |
28869 LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28910 CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" |
|
28911 LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" |
28870 |
28912 |
28871 elif test "x$COMPILE_TYPE" = xreduced; then |
28913 elif test "x$COMPILE_TYPE" = xreduced; then |
28872 if test "x$OPENJDK_TARGET_OS" != xwindows; then |
28914 if test "x$OPENJDK_TARGET_OS" != xwindows; then |
28873 # Specify -m if running reduced on other Posix platforms |
28915 # Specify -m if running reduced on other Posix platforms |
28874 |
28916 |
28875 # keep track of c/cxx flags that we added outselves... |
28917 # keep track of c/cxx flags that we added outselves... |
28876 # to prevent emitting warning... |
28918 # to prevent emitting warning... |
28877 TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}" |
28919 ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28878 |
28920 ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28879 |
28921 ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
28880 CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}" |
28922 |
28881 CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}" |
28923 CFLAGS="${CFLAGS}${ADDED_CFLAGS}" |
28882 LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}" |
28924 CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" |
28883 |
28925 LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" |
28884 CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28926 |
28885 CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28927 CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" |
28886 LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}" |
28928 CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" |
|
28929 LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" |
28887 |
28930 |
28888 fi |
28931 fi |
28889 fi |
28932 fi |
28890 |
28933 |
28891 # Make compilation sanity check |
28934 # Make compilation sanity check |
28947 #define SIZEOF_INT_P $ac_cv_sizeof_int_p |
28990 #define SIZEOF_INT_P $ac_cv_sizeof_int_p |
28948 _ACEOF |
28991 _ACEOF |
28949 |
28992 |
28950 |
28993 |
28951 |
28994 |
28952 if test "x$SIZEOF_INT_P" != "x$ac_cv_sizeof_int_p"; then |
28995 # AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*' |
28953 # Workaround autoconf bug, see http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html |
28996 if test "x$ac_cv_sizeof_int_p" = x; then |
28954 SIZEOF_INT_P="$ac_cv_sizeof_int_p" |
|
28955 fi |
|
28956 |
|
28957 if test "x$SIZEOF_INT_P" = x; then |
|
28958 # The test failed, lets stick to the assumed value. |
28997 # The test failed, lets stick to the assumed value. |
28959 { $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 |
28998 { $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 |
28960 $as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;} |
28999 $as_echo "$as_me: WARNING: The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS." >&2;} |
28961 else |
29000 else |
28962 TESTED_TARGET_CPU_BITS=`expr 8 \* $SIZEOF_INT_P` |
29001 TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p` |
28963 |
29002 |
28964 if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then |
29003 if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then |
28965 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 |
29004 # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects |
|
29005 # Let's try to implicitely set the compilers target architecture and retry the test |
|
29006 { $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 |
|
29007 $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;} |
|
29008 { $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 |
|
29009 $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;} |
|
29010 |
|
29011 # keep track of c/cxx flags that we added outselves... |
|
29012 # to prevent emitting warning... |
|
29013 ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
|
29014 ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
|
29015 ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
|
29016 |
|
29017 CFLAGS="${CFLAGS}${ADDED_CFLAGS}" |
|
29018 CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}" |
|
29019 LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}" |
|
29020 |
|
29021 CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}" |
|
29022 CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}" |
|
29023 LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}" |
|
29024 |
|
29025 |
|
29026 # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value! |
|
29027 unset ac_cv_sizeof_int_p |
|
29028 # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF |
|
29029 cat >>confdefs.h <<_ACEOF |
|
29030 #undef SIZEOF_INT_P |
|
29031 _ACEOF |
|
29032 |
|
29033 # The cast to long int works around a bug in the HP C Compiler |
|
29034 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects |
|
29035 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. |
|
29036 # This bug is HP SR number 8606223364. |
|
29037 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 |
|
29038 $as_echo_n "checking size of int *... " >&6; } |
|
29039 if ${ac_cv_sizeof_int_p+:} false; then : |
|
29040 $as_echo_n "(cached) " >&6 |
|
29041 else |
|
29042 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : |
|
29043 |
|
29044 else |
|
29045 if test "$ac_cv_type_int_p" = yes; then |
|
29046 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
|
29047 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
|
29048 as_fn_error 77 "cannot compute sizeof (int *) |
|
29049 See \`config.log' for more details" "$LINENO" 5; } |
|
29050 else |
|
29051 ac_cv_sizeof_int_p=0 |
|
29052 fi |
|
29053 fi |
|
29054 |
|
29055 fi |
|
29056 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5 |
|
29057 $as_echo "$ac_cv_sizeof_int_p" >&6; } |
|
29058 |
|
29059 |
|
29060 |
|
29061 cat >>confdefs.h <<_ACEOF |
|
29062 #define SIZEOF_INT_P $ac_cv_sizeof_int_p |
|
29063 _ACEOF |
|
29064 |
|
29065 |
|
29066 |
|
29067 TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p` |
|
29068 |
|
29069 if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then |
|
29070 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 |
|
29071 fi |
28966 fi |
29072 fi |
28967 fi |
29073 fi |
28968 |
29074 |
28969 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target address size" >&5 |
29075 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target address size" >&5 |
28970 $as_echo_n "checking for target address size... " >&6; } |
29076 $as_echo_n "checking for target address size... " >&6; } |
29272 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" |
29378 CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" |
29273 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" |
29379 CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" |
29274 CFLAGS_JDKLIB_EXTRA='-xstrconst' |
29380 CFLAGS_JDKLIB_EXTRA='-xstrconst' |
29275 POST_STRIP_CMD="$STRIP -x" |
29381 POST_STRIP_CMD="$STRIP -x" |
29276 POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" |
29382 POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" |
|
29383 fi |
|
29384 if test "x$OPENJDK_TARGET_OS" = xaix; then |
|
29385 COMPILER_NAME=xlc |
|
29386 PICFLAG="-qpic=large" |
|
29387 LIBRARY_PREFIX=lib |
|
29388 SHARED_LIBRARY='lib$1.so' |
|
29389 STATIC_LIBRARY='lib$1.a' |
|
29390 SHARED_LIBRARY_FLAGS="-qmkshrobj" |
|
29391 SHARED_LIBRARY_SUFFIX='.so' |
|
29392 STATIC_LIBRARY_SUFFIX='.a' |
|
29393 OBJ_SUFFIX='.o' |
|
29394 EXE_SUFFIX='' |
|
29395 SET_SHARED_LIBRARY_NAME='' |
|
29396 SET_SHARED_LIBRARY_MAPFILE='' |
|
29397 C_FLAG_REORDER='' |
|
29398 CXX_FLAG_REORDER='' |
|
29399 SET_SHARED_LIBRARY_ORIGIN='' |
|
29400 SET_EXECUTABLE_ORIGIN="" |
|
29401 CFLAGS_JDK="" |
|
29402 CXXFLAGS_JDK="" |
|
29403 CFLAGS_JDKLIB_EXTRA='' |
|
29404 POST_STRIP_CMD="$STRIP -X32_64" |
|
29405 POST_MCS_CMD="" |
29277 fi |
29406 fi |
29278 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
29407 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
29279 # If it is not gcc, then assume it is the MS Visual Studio compiler |
29408 # If it is not gcc, then assume it is the MS Visual Studio compiler |
29280 COMPILER_NAME=cl |
29409 COMPILER_NAME=cl |
29281 PICFLAG="" |
29410 PICFLAG="" |
29455 CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" |
29584 CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" |
29456 CXX_O_FLAG_NONE="" |
29585 CXX_O_FLAG_NONE="" |
29457 ;; |
29586 ;; |
29458 esac |
29587 esac |
29459 |
29588 |
29460 CFLAGS_DEBUG_SYMBOLS="-g -xs" |
29589 CFLAGS_DEBUG_SYMBOLS="-g -xs" |
29461 CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs" |
29590 CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs" |
|
29591 ;; |
|
29592 xlc ) |
|
29593 C_FLAG_DEPS="-qmakedep=gcc -MF" |
|
29594 CXX_FLAG_DEPS="-qmakedep=gcc -MF" |
|
29595 C_O_FLAG_HIGHEST="-O3" |
|
29596 C_O_FLAG_HI="-O3 -qstrict" |
|
29597 C_O_FLAG_NORM="-O2" |
|
29598 C_O_FLAG_NONE="" |
|
29599 CXX_O_FLAG_HIGHEST="-O3" |
|
29600 CXX_O_FLAG_HI="-O3 -qstrict" |
|
29601 CXX_O_FLAG_NORM="-O2" |
|
29602 CXX_O_FLAG_NONE="" |
|
29603 CFLAGS_DEBUG_SYMBOLS="-g" |
|
29604 CXXFLAGS_DEBUG_SYMBOLS="-g" |
|
29605 LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall" |
|
29606 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
|
29607 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
|
29608 ;; |
29462 esac |
29609 esac |
29463 ;; |
29610 ;; |
29464 CL ) |
29611 CL ) |
29465 C_O_FLAG_HIGHEST="-O2" |
29612 C_O_FLAG_HIGHEST="-O2" |
29466 C_O_FLAG_HI="-O1" |
29613 C_O_FLAG_HI="-O1" |
29580 CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib" |
29727 CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib" |
29581 |
29728 |
29582 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" |
29729 LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext" |
29583 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" |
29730 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib" |
29584 ;; |
29731 ;; |
|
29732 xlc ) |
|
29733 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
|
29734 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" |
|
29735 |
|
29736 LDFLAGS_JDK="$LDFLAGS_JDK" |
|
29737 LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK" |
|
29738 ;; |
29585 cl ) |
29739 cl ) |
29586 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ |
29740 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ |
29587 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \ |
29741 -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \ |
29588 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ |
29742 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ |
29589 -DWIN32 -DIAL" |
29743 -DWIN32 -DIAL" |
29649 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DWINDOWS" |
29803 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DWINDOWS" |
29650 fi |
29804 fi |
29651 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
29805 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
29652 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS" |
29806 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS" |
29653 fi |
29807 fi |
|
29808 if test "x$OPENJDK_TARGET_OS" = xaix; then |
|
29809 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DAIX -DPPC64" |
|
29810 fi |
29654 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
29811 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
29655 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" |
29812 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" |
29656 # Setting these parameters makes it an error to link to macosx APIs that are |
29813 # Setting these parameters makes it an error to link to macosx APIs that are |
29657 # newer than the given OS version and makes the linked binaries compatible even |
29814 # newer than the given OS version and makes the linked binaries compatible even |
29658 # if built on a newer version of the OS. |
29815 # if built on a newer version of the OS. |
29857 ZERO_ARCHFLAG="" |
30014 ZERO_ARCHFLAG="" |
29858 fi |
30015 fi |
29859 |
30016 |
29860 |
30017 |
29861 |
30018 |
29862 # Check that the compiler supports -mX flags |
30019 # Check that the compiler supports -mX (or -qX on AIX) flags |
29863 # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does |
30020 # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does |
29864 |
30021 |
29865 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"" >&5 |
30022 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"" >&5 |
29866 $as_echo_n "checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"... " >&6; } |
30023 $as_echo_n "checking if compiler supports \"${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}\"... " >&6; } |
29867 supports=yes |
30024 supports=yes |
29868 |
30025 |
29869 saved_cflags="$CFLAGS" |
30026 saved_cflags="$CFLAGS" |
29870 CFLAGS="$CFLAGS -m${OPENJDK_TARGET_CPU_BITS}" |
30027 CFLAGS="$CFLAGS ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
29871 ac_ext=c |
30028 ac_ext=c |
29872 ac_cpp='$CPP $CPPFLAGS' |
30029 ac_cpp='$CPP $CPPFLAGS' |
29873 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
30030 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
29874 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
30031 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
29875 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
30032 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
29893 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
30050 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
29894 |
30051 |
29895 CFLAGS="$saved_cflags" |
30052 CFLAGS="$saved_cflags" |
29896 |
30053 |
29897 saved_cxxflags="$CXXFLAGS" |
30054 saved_cxxflags="$CXXFLAGS" |
29898 CXXFLAGS="$CXXFLAG -m${OPENJDK_TARGET_CPU_BITS}" |
30055 CXXFLAGS="$CXXFLAG ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}" |
29899 ac_ext=cpp |
30056 ac_ext=cpp |
29900 ac_cpp='$CXXCPP $CPPFLAGS' |
30057 ac_cpp='$CXXCPP $CPPFLAGS' |
29901 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
30058 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
29902 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
30059 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
29903 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
30060 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
30047 ALSA_NOT_NEEDED=yes |
30204 ALSA_NOT_NEEDED=yes |
30048 PULSE_NOT_NEEDED=yes |
30205 PULSE_NOT_NEEDED=yes |
30049 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 |
30206 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 |
30050 $as_echo "alsa pulse" >&6; } |
30207 $as_echo "alsa pulse" >&6; } |
30051 fi |
30208 fi |
|
30209 |
|
30210 if test "x$OPENJDK_TARGET_OS" = xaix; then |
|
30211 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on AIX?" >&5 |
|
30212 $as_echo_n "checking what is not needed on AIX?... " >&6; } |
|
30213 ALSA_NOT_NEEDED=yes |
|
30214 PULSE_NOT_NEEDED=yes |
|
30215 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 |
|
30216 $as_echo "alsa pulse" >&6; } |
|
30217 fi |
|
30218 |
30052 |
30219 |
30053 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
30220 if test "x$OPENJDK_TARGET_OS" = xwindows; then |
30054 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5 |
30221 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on Windows?" >&5 |
30055 $as_echo_n "checking what is not needed on Windows?... " >&6; } |
30222 $as_echo_n "checking what is not needed on Windows?... " >&6; } |
30056 CUPS_NOT_NEEDED=yes |
30223 CUPS_NOT_NEEDED=yes |
33116 # Looks like a Linux (or cygwin) system |
33276 # Looks like a Linux (or cygwin) system |
33117 MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` |
33277 MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` |
33118 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` |
33278 MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` |
33119 FOUND_MEM=yes |
33279 FOUND_MEM=yes |
33120 elif test -x /usr/sbin/prtconf; then |
33280 elif test -x /usr/sbin/prtconf; then |
33121 # Looks like a Solaris system |
33281 # Looks like a Solaris or AIX system |
33122 MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print $3 }'` |
33282 MEMORY_SIZE=`/usr/sbin/prtconf | grep "^Memory [Ss]ize" | awk '{ print $3 }'` |
33123 FOUND_MEM=yes |
33283 FOUND_MEM=yes |
33124 elif test -x /usr/sbin/system_profiler; then |
33284 elif test -x /usr/sbin/system_profiler; then |
33125 # Looks like a MacOSX system |
33285 # Looks like a MacOSX system |
33126 MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` |
33286 MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` |
33127 MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |
33287 MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` |