1.1 --- a/common/autoconf/generated-configure.sh Tue Jun 25 13:47:00 2013 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Tue Jul 02 17:38:10 2013 -0700
1.3 @@ -638,6 +638,7 @@
1.4 CFLAGS_DEBUG_SYMBOLS
1.5 ZIP_DEBUGINFO_FILES
1.6 ENABLE_DEBUG_SYMBOLS
1.7 +USING_BROKEN_SUSE_LD
1.8 COMPILER_SUPPORTS_TARGET_BITS_FLAG
1.9 ZERO_ARCHFLAG
1.10 LDFLAGS_CXX_JDK
1.11 @@ -824,6 +825,7 @@
1.12 DEBUG_LEVEL
1.13 MACOSX_UNIVERSAL
1.14 INCLUDE_SA
1.15 +JVM_VARIANT_CORE
1.16 JVM_VARIANT_ZEROSHARK
1.17 JVM_VARIANT_ZERO
1.18 JVM_VARIANT_KERNEL
1.19 @@ -831,6 +833,7 @@
1.20 JVM_VARIANT_CLIENT
1.21 JVM_VARIANT_SERVER
1.22 JVM_VARIANTS
1.23 +JVM_INTERPRETER
1.24 JDK_VARIANT
1.25 SET_OPENJDK
1.26 BUILD_LOG_WRAPPER
1.27 @@ -975,6 +978,7 @@
1.28 with_devkit
1.29 enable_openjdk_only
1.30 with_jdk_variant
1.31 +with_jvm_interpreter
1.32 with_jvm_variants
1.33 enable_debug
1.34 with_debug_level
1.35 @@ -1713,8 +1717,10 @@
1.36 --with-devkit use this directory as base for tools-dir and
1.37 sys-root (for cross-compiling)
1.38 --with-jdk-variant JDK variant to build (normal) [normal]
1.39 + --with-jvm-interpreter JVM interpreter to build (template, cpp) [template]
1.40 --with-jvm-variants JVM variants (separated by commas) to build (server,
1.41 - client, minimal1, kernel, zero, zeroshark) [server]
1.42 + client, minimal1, kernel, zero, zeroshark, core)
1.43 + [server]
1.44 --with-debug-level set the debug level (release, fastdebug, slowdebug)
1.45 [release]
1.46 --with-conf-name use this as the name of the configuration [generated
1.47 @@ -2845,7 +2851,7 @@
1.48 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.49 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.50 as_fn_error $? "failed to load site script $ac_site_file
1.51 -See \`config.log' for more details" "$LINENO" 5 ; }
1.52 +See \`config.log' for more details" "$LINENO" 5; }
1.53 fi
1.54 done
1.55
1.56 @@ -3505,6 +3511,8 @@
1.57
1.58
1.59
1.60 +
1.61 +
1.62 ###############################################################################
1.63 #
1.64 # Should we build only OpenJDK even if closed sources are present?
1.65 @@ -3782,7 +3790,7 @@
1.66 #CUSTOM_AUTOCONF_INCLUDE
1.67
1.68 # Do not change or remove the following line, it is needed for consistency checks:
1.69 -DATE_WHEN_GENERATED=1371547824
1.70 +DATE_WHEN_GENERATED=1372808067
1.71
1.72 ###############################################################################
1.73 #
1.74 @@ -6560,7 +6568,7 @@
1.75 $as_echo "$ac_cv_build" >&6; }
1.76 case $ac_cv_build in
1.77 *-*-*) ;;
1.78 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
1.79 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
1.80 esac
1.81 build=$ac_cv_build
1.82 ac_save_IFS=$IFS; IFS='-'
1.83 @@ -6593,7 +6601,7 @@
1.84 $as_echo "$ac_cv_host" >&6; }
1.85 case $ac_cv_host in
1.86 *-*-*) ;;
1.87 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
1.88 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
1.89 esac
1.90 host=$ac_cv_host
1.91 ac_save_IFS=$IFS; IFS='-'
1.92 @@ -6626,7 +6634,7 @@
1.93 $as_echo "$ac_cv_target" >&6; }
1.94 case $ac_cv_target in
1.95 *-*-*) ;;
1.96 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
1.97 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
1.98 esac
1.99 target=$ac_cv_target
1.100 ac_save_IFS=$IFS; IFS='-'
1.101 @@ -7572,6 +7580,37 @@
1.102 $as_echo "$JDK_VARIANT" >&6; }
1.103
1.104
1.105 +###############################################################################
1.106 +#
1.107 +# Check which interpreter of the JVM we want to build.
1.108 +# Currently we have:
1.109 +# template: Template interpreter (the default)
1.110 +# cpp : C++ interpreter
1.111 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which interpreter of the JVM to build" >&5
1.112 +$as_echo_n "checking which interpreter of the JVM to build... " >&6; }
1.113 +
1.114 +# Check whether --with-jvm-interpreter was given.
1.115 +if test "${with_jvm_interpreter+set}" = set; then :
1.116 + withval=$with_jvm_interpreter;
1.117 +fi
1.118 +
1.119 +
1.120 +if test "x$with_jvm_interpreter" = x; then
1.121 + with_jvm_interpreter="template"
1.122 +fi
1.123 +
1.124 +JVM_INTERPRETER="$with_jvm_interpreter"
1.125 +
1.126 +if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then
1.127 + as_fn_error $? "The available JVM interpreters are: template, cpp" "$LINENO" 5
1.128 +fi
1.129 +
1.130 +
1.131 +
1.132 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_interpreter" >&5
1.133 +$as_echo "$with_jvm_interpreter" >&6; }
1.134 +
1.135 +
1.136
1.137 ###############################################################################
1.138 #
1.139 @@ -7584,6 +7623,7 @@
1.140 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
1.141 # zero: no machine code interpreter, no compiler
1.142 # zeroshark: zero interpreter and shark/llvm compiler backend
1.143 +# core: interpreter only, no compiler (only works on some platforms)
1.144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
1.145 $as_echo_n "checking which variants of the JVM to build... " >&6; }
1.146
1.147 @@ -7598,10 +7638,10 @@
1.148 fi
1.149
1.150 JVM_VARIANTS=",$with_jvm_variants,"
1.151 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
1.152 +TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'`
1.153
1.154 if test "x$TEST_VARIANTS" != "x,"; then
1.155 - as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5
1.156 + as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core" "$LINENO" 5
1.157 fi
1.158 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
1.159 $as_echo "$with_jvm_variants" >&6; }
1.160 @@ -7612,6 +7652,7 @@
1.161 JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
1.162 JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
1.163 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
1.164 +JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
1.165
1.166 if test "x$JVM_VARIANT_CLIENT" = xtrue; then
1.167 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.168 @@ -7631,7 +7672,7 @@
1.169
1.170 # Replace the commas with AND for use in the build directory name.
1.171 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
1.172 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
1.173 +COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'`
1.174 if test "x$COUNT_VARIANTS" != "x,1"; then
1.175 BUILDING_MULTIPLE_JVM_VARIANTS=yes
1.176 else
1.177 @@ -7646,6 +7687,7 @@
1.178
1.179
1.180
1.181 +
1.182 INCLUDE_SA=true
1.183 if test "x$JVM_VARIANT_ZERO" = xtrue ; then
1.184 INCLUDE_SA=false
1.185 @@ -7653,6 +7695,9 @@
1.186 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
1.187 INCLUDE_SA=false
1.188 fi
1.189 +if test "x$VAR_CPU" = xppc64 ; then
1.190 + INCLUDE_SA=false
1.191 +fi
1.192
1.193
1.194 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.195 @@ -7769,6 +7814,10 @@
1.196 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
1.197 fi
1.198
1.199 +if test "x$JVM_VARIANT_CORE" = xtrue; then
1.200 + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
1.201 +fi
1.202 +
1.203 HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
1.204
1.205 # On Macosx universal binaries are produced, but they only contain
1.206 @@ -15718,7 +15767,7 @@
1.207 JVM_ARG_OK=false
1.208 fi
1.209
1.210 - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.211 + if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then
1.212 # Why does macosx need more heap? Its the huge JDK batch.
1.213
1.214 $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
1.215 @@ -20041,7 +20090,7 @@
1.216 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.217 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.218 as_fn_error $? "no acceptable C compiler found in \$PATH
1.219 -See \`config.log' for more details" "$LINENO" 5 ; }
1.220 +See \`config.log' for more details" "$LINENO" 5; }
1.221
1.222 # Provide some information about the compiler.
1.223 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1.224 @@ -20156,7 +20205,7 @@
1.225 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.226 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.227 as_fn_error 77 "C compiler cannot create executables
1.228 -See \`config.log' for more details" "$LINENO" 5 ; }
1.229 +See \`config.log' for more details" "$LINENO" 5; }
1.230 else
1.231 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.232 $as_echo "yes" >&6; }
1.233 @@ -20199,7 +20248,7 @@
1.234 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.235 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.236 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
1.237 -See \`config.log' for more details" "$LINENO" 5 ; }
1.238 +See \`config.log' for more details" "$LINENO" 5; }
1.239 fi
1.240 rm -f conftest conftest$ac_cv_exeext
1.241 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
1.242 @@ -20258,7 +20307,7 @@
1.243 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.244 as_fn_error $? "cannot run C compiled programs.
1.245 If you meant to cross compile, use \`--host'.
1.246 -See \`config.log' for more details" "$LINENO" 5 ; }
1.247 +See \`config.log' for more details" "$LINENO" 5; }
1.248 fi
1.249 fi
1.250 fi
1.251 @@ -20310,7 +20359,7 @@
1.252 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.253 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.254 as_fn_error $? "cannot compute suffix of object files: cannot compile
1.255 -See \`config.log' for more details" "$LINENO" 5 ; }
1.256 +See \`config.log' for more details" "$LINENO" 5; }
1.257 fi
1.258 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1.259 fi
1.260 @@ -24485,7 +24534,7 @@
1.261 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.262 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.263 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1.264 -See \`config.log' for more details" "$LINENO" 5 ; }
1.265 +See \`config.log' for more details" "$LINENO" 5; }
1.266 fi
1.267
1.268 ac_ext=cpp
1.269 @@ -24885,7 +24934,7 @@
1.270 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.271 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.272 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1.273 -See \`config.log' for more details" "$LINENO" 5 ; }
1.274 +See \`config.log' for more details" "$LINENO" 5; }
1.275 fi
1.276
1.277 ac_ext=cpp
1.278 @@ -28722,7 +28771,7 @@
1.279 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.280 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.281 as_fn_error 77 "cannot compute sizeof (int *)
1.282 -See \`config.log' for more details" "$LINENO" 5 ; }
1.283 +See \`config.log' for more details" "$LINENO" 5; }
1.284 else
1.285 ac_cv_sizeof_int_p=0
1.286 fi
1.287 @@ -29724,6 +29773,27 @@
1.288
1.289
1.290
1.291 + # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
1.292 + USING_BROKEN_SUSE_LD=no
1.293 + if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
1.294 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken SuSE 'ld' which only understands anonymous version tags in executables" >&5
1.295 +$as_echo_n "checking for broken SuSE 'ld' which only understands anonymous version tags in executables... " >&6; }
1.296 + echo "SUNWprivate_1.1 { local: *; };" > version-script.map
1.297 + echo "int main() { }" > main.c
1.298 + if $CXX -Xlinker -version-script=version-script.map main.c 2>&5 >&5; then
1.299 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.300 +$as_echo "no" >&6; }
1.301 + USING_BROKEN_SUSE_LD=no
1.302 + else
1.303 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.304 +$as_echo "yes" >&6; }
1.305 + USING_BROKEN_SUSE_LD=yes
1.306 + fi
1.307 + rm -rf version-script.map main.c
1.308 + fi
1.309 +
1.310 +
1.311 +
1.312 # Setup debug symbols (need objcopy from the toolchain for that)
1.313
1.314 #
1.315 @@ -29945,7 +30015,7 @@
1.316 have_x=disabled
1.317 else
1.318 case $x_includes,$x_libraries in #(
1.319 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
1.320 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
1.321 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
1.322 $as_echo_n "(cached) " >&6
1.323 else
1.324 @@ -32605,7 +32675,7 @@
1.325 See the pkg-config man page for more details.
1.326
1.327 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1.328 -See \`config.log' for more details" "$LINENO" 5 ; }
1.329 +See \`config.log' for more details" "$LINENO" 5; }
1.330 else
1.331 LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
1.332 LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
1.333 @@ -34134,7 +34204,7 @@
1.334 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
1.335 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
1.336
1.337 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
1.338 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
1.339 esac
1.340 done
1.341
1.342 @@ -34449,7 +34519,7 @@
1.343 esac
1.344 case $ac_mode$ac_tag in
1.345 :[FHL]*:*);;
1.346 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
1.347 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
1.348 :[FH]-) ac_tag=-:-;;
1.349 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
1.350 esac
1.351 @@ -34477,7 +34547,7 @@
1.352 [\\/$]*) false;;
1.353 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
1.354 esac ||
1.355 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
1.356 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
1.357 esac
1.358 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
1.359 as_fn_append ac_file_inputs " '$ac_f'"
1.360 @@ -34504,7 +34574,7 @@
1.361
1.362 case $ac_tag in
1.363 *:-:* | *:-) cat >"$tmp/stdin" \
1.364 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.365 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.366 esac
1.367 ;;
1.368 esac
