Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 15 Nov 2012 00:54:54 +0000
- author
- tbell
- date
- Thu, 15 Nov 2012 00:54:54 +0000
- changeset 515
- 06f146c05f49
- parent 508
- b772de306dc2
- parent 514
- e69396d6d3e8
- child 516
- ecf751a69f6a
Merge
1.1 --- a/common/autoconf/basics.m4 Wed Nov 14 12:28:00 2012 -0800 1.2 +++ b/common/autoconf/basics.m4 Thu Nov 15 00:54:54 2012 +0000 1.3 @@ -345,7 +345,13 @@ 1.4 [ CONF_NAME=${with_conf_name} ]) 1.5 1.6 # Test from where we are running configure, in or outside of src root. 1.7 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 1.8 +# To enable comparison of directories, CURDIR needs to be symlink free 1.9 +# just like SRC_ROOT already is 1.10 +NOSYM_CURDIR="$CURDIR" 1.11 +BASIC_REMOVE_SYMBOLIC_LINKS(NOSYM_CURDIR) 1.12 +if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \ 1.13 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \ 1.14 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 1.15 # We are running configure from the src root. 1.16 # Create a default ./build/target-variant-debuglevel output root. 1.17 if test "x${CONF_NAME}" = x; then
2.1 --- a/common/autoconf/build-performance.m4 Wed Nov 14 12:28:00 2012 -0800 2.2 +++ b/common/autoconf/build-performance.m4 Thu Nov 15 00:54:54 2012 +0000 2.3 @@ -204,7 +204,7 @@ 2.4 # 2.5 AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], 2.6 [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], 2.7 - [ENABLE_PRECOMPH=${enable_precompiled-headers}], [ENABLE_PRECOMPH=yes]) 2.8 + [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) 2.9 2.10 USE_PRECOMPILED_HEADER=1 2.11 if test "x$ENABLE_PRECOMPH" = xno; then 2.12 @@ -214,17 +214,16 @@ 2.13 if test "x$ENABLE_PRECOMPH" = xyes; then 2.14 # Check that the compiler actually supports precomp headers. 2.15 if test "x$GCC" = xyes; then 2.16 - AC_MSG_CHECKING([that precompiled headers work]) 2.17 + AC_MSG_CHECKING([that precompiled headers work]) 2.18 echo "int alfa();" > conftest.h 2.19 - $CXX -x c++-header conftest.h -o conftest.hpp.gch 2.20 + $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD 2.21 if test ! -f conftest.hpp.gch; then 2.22 - echo Precompiled header is not working! 2.23 USE_PRECOMPILED_HEADER=0 2.24 AC_MSG_RESULT([no]) 2.25 else 2.26 AC_MSG_RESULT([yes]) 2.27 fi 2.28 - rm -f conftest.h 2.29 + rm -f conftest.h conftest.hpp.gch 2.30 fi 2.31 fi 2.32
3.1 --- a/common/autoconf/generated-configure.sh Wed Nov 14 12:28:00 2012 -0800 3.2 +++ b/common/autoconf/generated-configure.sh Thu Nov 15 00:54:54 2012 +0000 3.3 @@ -1035,7 +1035,7 @@ 3.4 with_alsa_include 3.5 with_alsa_lib 3.6 with_zlib 3.7 -enable_static_link_stdc++ 3.8 +with_stdc++lib 3.9 with_num_cores 3.10 with_memory_size 3.11 with_sjavac_server_java 3.12 @@ -1712,9 +1712,6 @@ 3.13 --disable-macosx-runtime-support 3.14 disable the use of MacOSX Java runtime support 3.15 framework [enabled] 3.16 - --disable-static-link-stdc++ 3.17 - disable static linking of the C++ runtime on Linux 3.18 - [enabled] 3.19 --enable-sjavac use sjavac to do fast incremental compiles 3.20 [disabled] 3.21 --disable-precompiled-headers 3.22 @@ -1796,6 +1793,10 @@ 3.23 --with-alsa-lib specify directory for the alsa library 3.24 --with-zlib use zlib from build system or OpenJDK source 3.25 (system, bundled) [bundled] 3.26 + --with-stdc++lib=<static>,<dynamic>,<default> 3.27 + force linking of the C++ runtime on Linux to either 3.28 + static or dynamic, default is static with dynamic as 3.29 + fallback 3.30 --with-num-cores number of cores in the build system, e.g. 3.31 --with-num-cores=8 [probed] 3.32 --with-memory-size memory (in MB) available in the build system, e.g. 3.33 @@ -3067,7 +3068,7 @@ 3.34 #CUSTOM_AUTOCONF_INCLUDE 3.35 3.36 # Do not change or remove the following line, it is needed for consistency checks: 3.37 -DATE_WHEN_GENERATED=1352751880 3.38 +DATE_WHEN_GENERATED=1352917083 3.39 3.40 ############################################################################### 3.41 # 3.42 @@ -7136,7 +7137,56 @@ 3.43 3.44 3.45 # Test from where we are running configure, in or outside of src root. 3.46 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 3.47 +# To enable comparison of directories, CURDIR needs to be symlink free 3.48 +# just like SRC_ROOT already is 3.49 +NOSYM_CURDIR="$CURDIR" 3.50 + 3.51 + if test "x$OPENJDK_BUILD_OS" != xwindows; then 3.52 + # Follow a chain of symbolic links. Use readlink 3.53 + # where it exists, else fall back to horribly 3.54 + # complicated shell code. 3.55 + if test "x$READLINK_TESTED" != yes; then 3.56 + # On MacOSX there is a readlink tool with a different 3.57 + # purpose than the GNU readlink tool. Check the found readlink. 3.58 + ISGNU=`$READLINK --help 2>&1 | $GREP GNU` 3.59 + if test "x$ISGNU" = x; then 3.60 + # A readlink that we do not know how to use. 3.61 + # Are there other non-GNU readlinks out there? 3.62 + READLINK_TESTED=yes 3.63 + READLINK= 3.64 + fi 3.65 + fi 3.66 + 3.67 + if test "x$READLINK" != x; then 3.68 + NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR` 3.69 + else 3.70 + STARTDIR=$PWD 3.71 + COUNTER=0 3.72 + sym_link_dir=`$DIRNAME $NOSYM_CURDIR` 3.73 + sym_link_file=`$BASENAME $NOSYM_CURDIR` 3.74 + while test $COUNTER -lt 20; do 3.75 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` 3.76 + if test "x$ISLINK" == x; then 3.77 + # This is not a symbolic link! We are done! 3.78 + break 3.79 + fi 3.80 + # The link might be relative! We have to use cd to travel safely. 3.81 + cd $sym_link_dir 3.82 + # ... and we must get the to the absolute path, not one using symbolic links. 3.83 + cd `pwd -P` 3.84 + cd `$DIRNAME $ISLINK` 3.85 + sym_link_dir=`$THEPWDCMD` 3.86 + sym_link_file=`$BASENAME $ISLINK` 3.87 + let COUNTER=COUNTER+1 3.88 + done 3.89 + cd $STARTDIR 3.90 + NOSYM_CURDIR=$sym_link_dir/$sym_link_file 3.91 + fi 3.92 + fi 3.93 + 3.94 +if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \ 3.95 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \ 3.96 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then 3.97 # We are running configure from the src root. 3.98 # Create a default ./build/target-variant-debuglevel output root. 3.99 if test "x${CONF_NAME}" = x; then 3.100 @@ -33006,12 +33056,19 @@ 3.101 # statically link libstdc++ before C++ ABI is stablized on Linux unless 3.102 # dynamic build is configured on command line. 3.103 # 3.104 -# Check whether --enable-static-link-stdc++ was given. 3.105 -if test "${enable_static_link_stdc+++set}" = set; then 3.106 - enableval=$enable_static_link_stdc++; 3.107 -else 3.108 - 3.109 - enable_static_link_stdc__=yes 3.110 + 3.111 +# Check whether --with-stdc++lib was given. 3.112 +if test "${with_stdc++lib+set}" = set; then 3.113 + withval=$with_stdc++lib; 3.114 + if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \ 3.115 + && test "x$with_stdc__lib" != xdefault; then 3.116 + { { $as_echo "$as_me:$LINENO: error: Bad parameter value --with-stdc++lib=$with_stdc__lib!" >&5 3.117 +$as_echo "$as_me: error: Bad parameter value --with-stdc++lib=$with_stdc__lib!" >&2;} 3.118 + { (exit 1); exit 1; }; } 3.119 + fi 3.120 + 3.121 +else 3.122 + with_stdc__lib=default 3.123 3.124 fi 3.125 3.126 @@ -33157,38 +33214,40 @@ 3.127 { $as_echo "$as_me:$LINENO: result: $has_static_libstdcxx" >&5 3.128 $as_echo "$has_static_libstdcxx" >&6; } 3.129 3.130 - if test "x$has_static_libcxx" = xno && test "x$has_dynamic_libcxx" = xno; then 3.131 - { { $as_echo "$as_me:$LINENO: error: I cannot link to stdc++! Neither dynamically nor statically." >&5 3.132 -$as_echo "$as_me: error: I cannot link to stdc++! Neither dynamically nor statically." >&2;} 3.133 - { (exit 1); exit 1; }; } 3.134 - fi 3.135 - 3.136 - if test "x$enable_static_link_stdc__" = xyes && test "x$has_static_libstdcxx" = xno; then 3.137 - { $as_echo "$as_me:$LINENO: Static linking of libstdc++ was not possible reverting to dynamic linking." >&5 3.138 -$as_echo "$as_me: Static linking of libstdc++ was not possible reverting to dynamic linking." >&6;} 3.139 - enable_static_link_stdc__=no 3.140 - fi 3.141 - 3.142 - if test "x$enable_static_link_stdc__" = xno && test "x$has_dynamic_libstdcxx" = xno; then 3.143 - { $as_echo "$as_me:$LINENO: Dynamic linking of libstdc++ was not possible reverting to static linking." >&5 3.144 -$as_echo "$as_me: Dynamic linking of libstdc++ was not possible reverting to static linking." >&6;} 3.145 - enable_static_link_stdc__=yes 3.146 + if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then 3.147 + { { $as_echo "$as_me:$LINENO: error: Cannot link to stdc++, neither dynamically nor statically!" >&5 3.148 +$as_echo "$as_me: error: Cannot link to stdc++, neither dynamically nor statically!" >&2;} 3.149 + { (exit 1); exit 1; }; } 3.150 + fi 3.151 + 3.152 + if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then 3.153 + { { $as_echo "$as_me:$LINENO: error: Static linking of libstdc++ was not possible!" >&5 3.154 +$as_echo "$as_me: error: Static linking of libstdc++ was not possible!" >&2;} 3.155 + { (exit 1); exit 1; }; } 3.156 + fi 3.157 + 3.158 + if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then 3.159 + { { $as_echo "$as_me:$LINENO: error: Dynamic linking of libstdc++ was not possible!" >&5 3.160 +$as_echo "$as_me: error: Dynamic linking of libstdc++ was not possible!" >&2;} 3.161 + { (exit 1); exit 1; }; } 3.162 fi 3.163 3.164 { $as_echo "$as_me:$LINENO: checking how to link with libstdc++" >&5 3.165 $as_echo_n "checking how to link with libstdc++... " >&6; } 3.166 - if test "x$enable_static_link_stdc__" = xyes; then 3.167 + # If dynamic was requested, it's available since it would fail above otherwise. 3.168 + # If dynamic wasn't requested, go with static unless it isn't available. 3.169 + if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno; then 3.170 + LIBCXX="$LIBCXX -lstdc++" 3.171 + LDCXX="$CXX" 3.172 + STATIC_CXX_SETTING="STATIC_CXX=false" 3.173 + { $as_echo "$as_me:$LINENO: result: dynamic" >&5 3.174 +$as_echo "dynamic" >&6; } 3.175 + else 3.176 LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS" 3.177 LDCXX="$CC" 3.178 STATIC_CXX_SETTING="STATIC_CXX=true" 3.179 { $as_echo "$as_me:$LINENO: result: static" >&5 3.180 $as_echo "static" >&6; } 3.181 - else 3.182 - LIBCXX="$LIBCXX -lstdc++" 3.183 - LDCXX="$CXX" 3.184 - STATIC_CXX_SETTING="STATIC_CXX=false" 3.185 - { $as_echo "$as_me:$LINENO: result: dynamic" >&5 3.186 -$as_echo "dynamic" >&6; } 3.187 fi 3.188 fi 3.189 3.190 @@ -33646,7 +33705,7 @@ 3.191 # 3.192 # Check whether --enable-precompiled-headers was given. 3.193 if test "${enable_precompiled_headers+set}" = set; then 3.194 - enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled-headers} 3.195 + enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled_headers} 3.196 else 3.197 ENABLE_PRECOMPH=yes 3.198 fi 3.199 @@ -33663,9 +33722,8 @@ 3.200 { $as_echo "$as_me:$LINENO: checking that precompiled headers work" >&5 3.201 $as_echo_n "checking that precompiled headers work... " >&6; } 3.202 echo "int alfa();" > conftest.h 3.203 - $CXX -x c++-header conftest.h -o conftest.hpp.gch 3.204 + $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5 3.205 if test ! -f conftest.hpp.gch; then 3.206 - echo Precompiled header is not working! 3.207 USE_PRECOMPILED_HEADER=0 3.208 { $as_echo "$as_me:$LINENO: result: no" >&5 3.209 $as_echo "no" >&6; } 3.210 @@ -33673,7 +33731,7 @@ 3.211 { $as_echo "$as_me:$LINENO: result: yes" >&5 3.212 $as_echo "yes" >&6; } 3.213 fi 3.214 - rm -f conftest.h 3.215 + rm -f conftest.h conftest.hpp.gch 3.216 fi 3.217 fi 3.218
4.1 --- a/common/autoconf/hotspot-spec.gmk.in Wed Nov 14 12:28:00 2012 -0800 4.2 +++ b/common/autoconf/hotspot-spec.gmk.in Thu Nov 15 00:54:54 2012 +0000 4.3 @@ -95,6 +95,8 @@ 4.4 EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ 4.5 EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ 4.6 4.7 +USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ 4.8 + 4.9 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files. 4.10 # This is needed to get the LOG setting to work properly. 4.11 include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
5.1 --- a/common/autoconf/libraries.m4 Wed Nov 14 12:28:00 2012 -0800 5.2 +++ b/common/autoconf/libraries.m4 Thu Nov 15 00:54:54 2012 +0000 5.3 @@ -601,11 +601,16 @@ 5.4 # statically link libstdc++ before C++ ABI is stablized on Linux unless 5.5 # dynamic build is configured on command line. 5.6 # 5.7 -AC_ARG_ENABLE([static-link-stdc++], [AS_HELP_STRING([--disable-static-link-stdc++], 5.8 - [disable static linking of the C++ runtime on Linux @<:@enabled@:>@])],, 5.9 - [ 5.10 - enable_static_link_stdc__=yes 5.11 - ]) 5.12 +AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>], 5.13 + [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])], 5.14 + [ 5.15 + if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \ 5.16 + && test "x$with_stdc__lib" != xdefault; then 5.17 + AC_MSG_ERROR([Bad parameter value --with-stdc++lib=$with_stdc__lib!]) 5.18 + fi 5.19 + ], 5.20 + [with_stdc__lib=default] 5.21 +) 5.22 5.23 if test "x$OPENJDK_TARGET_OS" = xlinux; then 5.24 # Test if -lstdc++ works. 5.25 @@ -636,31 +641,31 @@ 5.26 AC_LANG_POP(C++) 5.27 AC_MSG_RESULT([$has_static_libstdcxx]) 5.28 5.29 - if test "x$has_static_libcxx" = xno && test "x$has_dynamic_libcxx" = xno; then 5.30 - AC_MSG_ERROR([I cannot link to stdc++! Neither dynamically nor statically.]) 5.31 + if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then 5.32 + AC_MSG_ERROR([Cannot link to stdc++, neither dynamically nor statically!]) 5.33 fi 5.34 5.35 - if test "x$enable_static_link_stdc__" = xyes && test "x$has_static_libstdcxx" = xno; then 5.36 - AC_MSG_NOTICE([Static linking of libstdc++ was not possible reverting to dynamic linking.]) 5.37 - enable_static_link_stdc__=no 5.38 + if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then 5.39 + AC_MSG_ERROR([Static linking of libstdc++ was not possible!]) 5.40 fi 5.41 5.42 - if test "x$enable_static_link_stdc__" = xno && test "x$has_dynamic_libstdcxx" = xno; then 5.43 - AC_MSG_NOTICE([Dynamic linking of libstdc++ was not possible reverting to static linking.]) 5.44 - enable_static_link_stdc__=yes 5.45 + if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then 5.46 + AC_MSG_ERROR([Dynamic linking of libstdc++ was not possible!]) 5.47 fi 5.48 5.49 AC_MSG_CHECKING([how to link with libstdc++]) 5.50 - if test "x$enable_static_link_stdc__" = xyes; then 5.51 + # If dynamic was requested, it's available since it would fail above otherwise. 5.52 + # If dynamic wasn't requested, go with static unless it isn't available. 5.53 + if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno; then 5.54 + LIBCXX="$LIBCXX -lstdc++" 5.55 + LDCXX="$CXX" 5.56 + STATIC_CXX_SETTING="STATIC_CXX=false" 5.57 + AC_MSG_RESULT([dynamic]) 5.58 + else 5.59 LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS" 5.60 LDCXX="$CC" 5.61 STATIC_CXX_SETTING="STATIC_CXX=true" 5.62 AC_MSG_RESULT([static]) 5.63 - else 5.64 - LIBCXX="$LIBCXX -lstdc++" 5.65 - LDCXX="$CXX" 5.66 - STATIC_CXX_SETTING="STATIC_CXX=false" 5.67 - AC_MSG_RESULT([dynamic]) 5.68 fi 5.69 fi 5.70 AC_SUBST(STATIC_CXX_SETTING)
6.1 --- a/common/bin/compare.sh Wed Nov 14 12:28:00 2012 -0800 6.2 +++ b/common/bin/compare.sh Thu Nov 15 00:54:54 2012 +0000 6.3 @@ -283,7 +283,7 @@ 6.4 ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \ 6.5 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \ 6.6 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ 6.7 - ! -name "*.lib" ! -name "*.war" \ 6.8 + ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \ 6.9 | $GREP -v "./bin/" | $SORT | $FILTER) 6.10 6.11 echo General files... 6.12 @@ -611,10 +611,19 @@ 6.13 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) 6.14 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) 6.15 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) 6.16 - if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then 6.17 + if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \ 6.18 + && [ "$DIFF_SIZE_REL" -lt 102 ]; then 6.19 SIZE_MSG="($SIZE_MSG)" 6.20 DIFF_SIZE= 6.21 - elif [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_NUM" = 512 ]; then 6.22 + elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 6.23 + && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 6.24 + && [ "$DIFF_SIZE_NUM" = 512 ]; then 6.25 + # On windows, size of binaries increase in 512 increments. 6.26 + SIZE_MSG="($SIZE_MSG)" 6.27 + DIFF_SIZE= 6.28 + elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 6.29 + && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 6.30 + && [ "$DIFF_SIZE_NUM" = -512 ]; then 6.31 # On windows, size of binaries increase in 512 increments. 6.32 SIZE_MSG="($SIZE_MSG)" 6.33 DIFF_SIZE= 6.34 @@ -840,7 +849,7 @@ 6.35 OTHER_DIR=$2 6.36 WORK_DIR=$3 6.37 6.38 - LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' \) | $SORT | $FILTER) 6.39 + LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER) 6.40 6.41 if [ -n "$LIBS" ]; then 6.42 echo Libraries... 6.43 @@ -1218,7 +1227,12 @@ 6.44 6.45 if [ "$CMP_LIBS" = "true" ]; then 6.46 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 6.47 + echo -n "J2SDK " 6.48 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 6.49 + if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 6.50 + echo -n "J2RE " 6.51 + compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 6.52 + fi 6.53 fi 6.54 if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then 6.55 echo -n "Bundle "
7.1 --- a/common/bin/compare_exceptions.sh.incl Wed Nov 14 12:28:00 2012 -0800 7.2 +++ b/common/bin/compare_exceptions.sh.incl Thu Nov 15 00:54:54 2012 +0000 7.3 @@ -881,6 +881,7 @@ 7.4 7.5 KNOWN_BIN_DIFF=" 7.6 ./jre/lib/libJObjC.dylib 7.7 +./lib/libJObjC.dylib 7.8 " 7.9 7.10 ACCEPTED_BIN_DIFF=" 7.11 @@ -932,26 +933,34 @@ 7.12 ./jre/bin/tnameserv 7.13 ./jre/lib/libsaproc.dylib 7.14 ./jre/lib/server/libjvm.dylib 7.15 +./lib/libsaproc.dylib 7.16 +./lib/server/libjvm.dylib 7.17 +./lib/deploy/JavaControlPanel.prefPane/Contents/MacOS/JavaControlPanel 7.18 " 7.19 7.20 KNOWN_SIZE_DIFF=" 7.21 ./jre/lib/libJObjC.dylib 7.22 +./lib/libJObjC.dylib 7.23 " 7.24 7.25 SORT_SYMBOLS=" 7.26 ./jre/lib/libJObjC.dylib 7.27 +./lib/libJObjC.dylib 7.28 " 7.29 7.30 KNOWN_SYM_DIFF=" 7.31 ./jre/lib/libJObjC.dylib 7.32 +./lib/libJObjC.dylib 7.33 " 7.34 7.35 KNOWN_ELF_DIFF=" 7.36 ./jre/lib/libJObjC.dylib 7.37 +./lib/libJObjC.dylib 7.38 " 7.39 7.40 KNOWN_DIS_DIFF=" 7.41 ./jre/lib/libJObjC.dylib 7.42 +./lib/libJObjC.dylib 7.43 " 7.44 7.45 fi
8.1 --- a/common/makefiles/MakeHelpers.gmk Wed Nov 14 12:28:00 2012 -0800 8.2 +++ b/common/makefiles/MakeHelpers.gmk Thu Nov 15 00:54:54 2012 +0000 8.3 @@ -142,7 +142,7 @@ 8.4 define TargetExit 8.5 $(call RecordEndTime,$(patsubst %-only,%,$@)) 8.6 $(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \ 8.7 - "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d " "`" 8.8 + "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`" 8.9 $(call CheckIfMakeAtEnd) 8.10 endef 8.11
