/hg/icedtea6: PR1317: Provide an option to build with a more up-...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 14 16:02:47 PST 2013
changeset 06c8caca7d7c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=06c8caca7d7c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Feb 15 00:02:19 2013 +0000
PR1317: Provide an option to build with a more up-to-date HotSpot
2013-02-14 Andrew John Hughes <gnu.andrew at redhat.com>
PR1317: Provide an option to build with a more up-to-date HotSpot
* patches/no-static-linking.patch:
Dropped; unneeded if STATIC_CXX is set to false.
* INSTALL: Update HotSpot build documentation.
* Makefile.am:
(SECURITY_PATCHES): Exclude patches in hs23 HotSpot
if building with it.
(ICEDTEA_PATCHES): Likewise, and exclude the ARM32
port which doesn't work with hs23. Also specialise
some patches which differ depending on HotSpot version.
(ICEDTEA_ECJ_PATCHES): Specialise hotspot-jdk-dependency.patch
depending on version of HotSpot being built.
(ICEDTEA_ENV): Pass STATIC_CXX=false to avoid patching.
Pass BUILD_GCC and BUILD_CXX in place of suffix patch if
building hs23.
* NEWS:
List this new feature and also the bug fix, PR1318.
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Define only once. Depend on
CACAO, Zero and Shark.
(IT_SET_SHARK_BUILD): Define only once.
(IT_ENABLE_JAMVM): Likewise.
(IT_ENABLE_CACAO): Likewise.
(IT_WITH_HOTSPOT_BUILD): Likewise. Set ALTERNATE_BUILD
to hs23. Depend on Zero build determination and use to
pick default. Error out if hs23 is enabled with Zero.
* hotspot.map: Add reference to hs23 from the 2.3 tree.
* patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch:
Added for hs23 build.
* patches/ecj/hotspot/original/hotspot-jdk-dependency.patch:
Moved from patches/ecj/hotspot-jdk-dependency.patch.
* patches/gcc-suffix-hotspot.patch:
Split out for original HotSpot builds.
* patches/gcc-suffix.patch: Original version minus HotSpot
chunk.
* patches/hotspot/hs23/arm-hsdis.patch,
* patches/hotspot/hs23/pr639-broken_shark_build.patch:
hs23 versions of these patches which don't appear upstream.
* patches/hotspot/original/arm-hsdis.patch,
* patches/hotspot/original/pr639-broken_shark_build.patch:
Moved from patches.
* patches/hotspot/hs23/remove_jsr292_tests.patch:
Remove JSR292 tests from hs23 HotSpot when building on 6.
diffstat:
ChangeLog | 46 +++
INSTALL | 18 +-
Makefile.am | 105 ++++--
NEWS | 5 +
acinclude.m4 | 27 +-
hotspot.map | 1 +
patches/arm-hsdis.patch | 90 ------
patches/ecj/hotspot-jdk-dependency.patch | 25 -
patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch | 23 +
patches/ecj/hotspot/original/hotspot-jdk-dependency.patch | 25 +
patches/gcc-suffix-hotspot.patch | 31 ++
patches/gcc-suffix.patch | 31 --
patches/hotspot/hs23/arm-hsdis.patch | 72 +++++
patches/hotspot/hs23/pr639-broken_shark_build.patch | 27 +
patches/hotspot/hs23/remove_jsr292_tests.patch | 199 ++++++++++++++
patches/hotspot/original/arm-hsdis.patch | 90 ++++++
patches/hotspot/original/pr639-broken_shark_build.patch | 44 +++
patches/no-static-linking.patch | 44 ---
patches/pr639-broken_shark_build.patch | 44 ---
19 files changed, 658 insertions(+), 289 deletions(-)
diffs (truncated from 1234 to 500 lines):
diff -r a31bd9ed229b -r 06c8caca7d7c ChangeLog
--- a/ChangeLog Thu Feb 14 00:01:03 2013 +0000
+++ b/ChangeLog Fri Feb 15 00:02:19 2013 +0000
@@ -1,3 +1,49 @@
+2013-02-14 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1317: Provide an option to build with a more up-to-date HotSpot
+ * patches/no-static-linking.patch:
+ Dropped; unneeded if STATIC_CXX is set to false.
+ * INSTALL: Update HotSpot build documentation.
+ * Makefile.am:
+ (SECURITY_PATCHES): Exclude patches in hs23 HotSpot
+ if building with it.
+ (ICEDTEA_PATCHES): Likewise, and exclude the ARM32
+ port which doesn't work with hs23. Also specialise
+ some patches which differ depending on HotSpot version.
+ (ICEDTEA_ECJ_PATCHES): Specialise hotspot-jdk-dependency.patch
+ depending on version of HotSpot being built.
+ (ICEDTEA_ENV): Pass STATIC_CXX=false to avoid patching.
+ Pass BUILD_GCC and BUILD_CXX in place of suffix patch if
+ building hs23.
+ * NEWS:
+ List this new feature and also the bug fix, PR1318.
+ * acinclude.m4:
+ (IT_ENABLE_ZERO_BUILD): Define only once. Depend on
+ CACAO, Zero and Shark.
+ (IT_SET_SHARK_BUILD): Define only once.
+ (IT_ENABLE_JAMVM): Likewise.
+ (IT_ENABLE_CACAO): Likewise.
+ (IT_WITH_HOTSPOT_BUILD): Likewise. Set ALTERNATE_BUILD
+ to hs23. Depend on Zero build determination and use to
+ pick default. Error out if hs23 is enabled with Zero.
+ * hotspot.map: Add reference to hs23 from the 2.3 tree.
+ * patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch:
+ Added for hs23 build.
+ * patches/ecj/hotspot/original/hotspot-jdk-dependency.patch:
+ Moved from patches/ecj/hotspot-jdk-dependency.patch.
+ * patches/gcc-suffix-hotspot.patch:
+ Split out for original HotSpot builds.
+ * patches/gcc-suffix.patch: Original version minus HotSpot
+ chunk.
+ * patches/hotspot/hs23/arm-hsdis.patch,
+ * patches/hotspot/hs23/pr639-broken_shark_build.patch:
+ hs23 versions of these patches which don't appear upstream.
+ * patches/hotspot/original/arm-hsdis.patch,
+ * patches/hotspot/original/pr639-broken_shark_build.patch:
+ Moved from patches.
+ * patches/hotspot/hs23/remove_jsr292_tests.patch:
+ Remove JSR292 tests from hs23 HotSpot when building on 6.
+
2013-02-14 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.11.6, 1.11.7, 1.12.1 & 1.12.2
diff -r a31bd9ed229b -r 06c8caca7d7c INSTALL
--- a/INSTALL Thu Feb 14 00:01:03 2013 +0000
+++ b/INSTALL Fri Feb 15 00:02:19 2013 +0000
@@ -319,12 +319,18 @@
of the requested build.
At present, IcedTea6 supports the 'original' HotSpot 20 provided as
-part of the upstream tarball. Note that the norm. is for up to one
-alternate (non-default) build to be supported and just passing
---with-hotspot-build (equivalent to --with-hotspot-build=yes) will
-always provide the alternate build. Conversely, passing
---without-hotspot-build (equivalent to --with-hotspot-build=no)
-provides the original build from the OpenJDK tarball.
+part of the upstream tarball and 'hs23', the HotSpot used by the IcedTea
+2.3.x series. Note that the norm. is for up to one alternate (non-default)
+build to be supported and just passing --with-hotspot-build
+(equivalent to --with-hotspot-build=yes) will always provide the alternate
+build. Conversely, passing --without-hotspot-build (equivalent to
+--with-hotspot-build=no) provides the original build from the OpenJDK tarball.
+
+When no option is specified, the default build is used. At present,
+this is 'hs23' unless the user is building Zero or Shark (either by
+choice, or because the build has default to this on architectures
+other than x86/x86_64/sparc). As 'hs23' is known not to work with
+Zero or Shark, 'original' is still the default for these builds.
Javascript Support
==================
diff -r a31bd9ed229b -r 06c8caca7d7c Makefile.am
--- a/Makefile.am Thu Feb 14 00:01:03 2013 +0000
+++ b/Makefile.am Fri Feb 15 00:02:19 2013 +0000
@@ -271,16 +271,19 @@
patches/security/20130201/8000540.patch \
patches/security/20130201/8000631.patch \
patches/security/20130201/8001242.patch \
- patches/security/20130201/8001307.patch \
patches/security/20130201/8001972.patch \
patches/security/20130201/8002325.patch \
patches/security/20130201/8001235.patch
+if !WITH_ALT_HSBUILD
+SECURITY_PATCHES += \
+ patches/security/20130201/8001307.patch
+endif
+
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
- patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
patches/openjdk/6607660-treelock.patch \
@@ -303,27 +306,20 @@
patches/parisc-opt.patch \
patches/lucene-crash.patch \
patches/version.patch \
- patches/version-hotspot.patch \
- patches/text-relocations.patch \
patches/openjdk/7043921-java_rmi_cgi.patch \
patches/use-system-tzdata.patch \
patches/headers.patch \
patches/gcc-suffix.patch \
- patches/memory-limits.patch \
patches/libraries.patch \
patches/jvmtiEnv.patch \
patches/lcms.patch \
- patches/print_lsb_release.patch \
patches/uname.patch \
patches/freetypeversion.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
patches/nomotif-mtoolkit.patch \
- patches/alpha-fixes.patch \
patches/alt-jar.patch \
patches/jdk-use-ssize_t.patch \
- patches/use-idx_t.patch \
- patches/params-cast-size_t.patch \
patches/clean-crypto.patch \
patches/arch.patch \
patches/lc_ctype.patch \
@@ -334,8 +330,6 @@
patches/pr261.patch \
patches/sparc-buildfixes.patch \
patches/sparc64-linux.patch \
- patches/sparc-ptracefix.patch \
- patches/sparc-trapsfix.patch \
patches/jtreg-6592792.patch \
patches/s390-noinline.patch \
patches/jtreg-dnd.patch \
@@ -344,15 +338,11 @@
patches/dnd-filelists.patch \
patches/disable-cc-incompatible-sanity-checks.patch \
patches/explicit-target-arch.patch \
- patches/openjdk/7019808-stack_noexec.patch \
patches/parisc.patch \
- patches/sh4-support.patch \
patches/policy-evaluation.patch \
- patches/update-bootclasspath.patch \
patches/openjdk/6959123-libpng_14.patch \
patches/applet_hole.patch \
patches/jtreg-httpTest.patch \
- patches/arm.patch \
patches/debug-dir.patch \
patches/override-redirect-metacity.patch \
patches/openjdk/6967533-pre_epoch.patch \
@@ -363,18 +353,15 @@
patches/openjdk/6510892-httpserver_test.patch \
patches/openjdk/6638712-wildcard_types.patch \
patches/openjdk/6650759-missing_inference.patch \
- patches/numa_on_early_glibc.patch \
patches/jtreg-international-fonts.patch \
patches/f14-fonts.patch \
patches/jtreg-T6638712-fix.patch \
patches/jtreg-T6650759m-fix.patch \
patches/openjdk/7003777-bad-html-entity-parse.patch \
- patches/jtreg-6929067-fix.patch \
patches/rendering-engine-tests.patch \
patches/openjdk/6800846-printing-quality.patch \
patches/rh661505-jpeg.patch \
patches/6703377-freetypescaler.patch \
- patches/ia64-fix.patch \
patches/openjdk/6642612-filechooser_button_sizes.patch \
patches/jtreg-international-fonts-styles.patch \
patches/openjdk/6736649-text_bearings.patch \
@@ -384,8 +371,6 @@
patches/openjdk/4724552-CubicCurve2D.patch \
patches/openjdk/4493128-CubicCurve2D.patch \
patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \
- patches/no-static-linking.patch \
- patches/openjdk/7041156-gcc_export_dynamic.patch \
patches/g344659-sparc_fix.patch \
patches/openjdk/6728834-blurred-lcd-aa-text.patch \
patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
@@ -409,14 +394,9 @@
patches/openjdk/7027667-AAShapePipeRegTest.patch \
patches/openjdk/7019861-AA-regression-fix.patch \
patches/g356743-libpng-1.5.patch \
- patches/openjdk/7032388-work_without_cmov_instruction.patch \
- patches/openjdk/7031385-gcc-register-allocation-fix.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
patches/openjdk/7036754-stroker-nan.patch \
patches/openjdk/pgram-pipe-regression.patch \
- patches/openjdk/7034464-transparent_huge_pages.patch \
- patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch \
- patches/openjdk/7043564-hugepage.patch \
patches/openjdk/mutter.patch \
patches/fonts-rhel-version.patch \
patches/openjdk/7036148-npe-null-jmenu-name.patch \
@@ -431,30 +411,21 @@
patches/openjdk/6818312-com.sun.awt.SecurityWarning.getSize.patch \
patches/jtreg-MappedByteBuffer-Basic.patch \
patches/openjdk/7008106-WindowOpacity.patch \
- patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch \
patches/openjdk/6699843-IllegalArgumentException_drawString.patch \
patches/openjdk/6918065-Crash_in_Java2D_blit_loop.patch \
patches/openjdk/6623219-Font_canDisplayUpTo_does_not_work.patch \
patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch \
- patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
- patches/openjdk/6796786-invalid_FP_identity_transform.patch \
- patches/openjdk/7042070-Typo_in_Test6796786.patch \
patches/openjdk/6679308-Poor_text_rendering_on_translucent_image.patch \
patches/openjdk/6842838-64-bit_failure_in_handling_invalid_manifest.patch \
patches/openjdk/6882768-test_for_6842838_is_broken.patch \
- patches/pr639-broken_shark_build.patch \
+ patches/hotspot/$(HSBUILD)/pr639-broken_shark_build.patch \
patches/powerpc-stacksize.patch \
- patches/jtreg-remove-test-6987555.patch \
- patches/jtreg-remove-test-6991596.patch \
- patches/openjdk/7036220-shark_llvm_29_headers.patch \
- patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \
patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch \
patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch \
patches/jtreg-ConstructDeflaterInput-fix.patch \
patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch \
patches/openjdk/7049339-anyblit-broken.patch \
- patches/jtreg-hotspot-Test7020373-fix.patch \
patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch \
patches/openjdk/6390045-error_cannot_access_java_lang_void.patch \
patches/openjdk/6752638-preferLocaleFonts_throws_NPE.patch \
@@ -462,15 +433,12 @@
patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch \
patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch \
patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch \
- patches/pr690-shark-jit-hs20.patch \
- patches/pr696-zero-fast_aldc-hs20.patch \
patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \
patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
- patches/arm-debug.patch \
- patches/arm-hsdis.patch \
+ patches/hotspot/$(HSBUILD)/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
@@ -500,10 +468,56 @@
patches/openjdk/6980681-corba_deadlock.patch \
patches/openjdk/7162902-corba_fixes.patch \
patches/traceable.patch \
- patches/openjdk/7010849-modernise_sa.patch \
patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
patches/openjdk/8004341-jck_dialog_failure.patch
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+ patches/hotspot/hs23/remove_jsr292_tests.patch
+else
+# stdc-limit-macros is part of 7032458
+# pr690-shark-jit-hs20.patch is part of 7032458
+# pr696-zero-fast_aldc-hs20.patch is 7030207 & part of 7032458
+ICEDTEA_PATCHES += \
+ patches/stdc-limit-macros.patch \
+ patches/version-hotspot.patch \
+ patches/text-relocations.patch \
+ patches/gcc-suffix-hotspot.patch \
+ patches/memory-limits.patch \
+ patches/print_lsb_release.patch \
+ patches/alpha-fixes.patch \
+ patches/use-idx_t.patch \
+ patches/params-cast-size_t.patch \
+ patches/sparc-ptracefix.patch \
+ patches/sparc-trapsfix.patch \
+ patches/openjdk/7019808-stack_noexec.patch \
+ patches/sh4-support.patch \
+ patches/update-bootclasspath.patch \
+ patches/arm.patch \
+ patches/numa_on_early_glibc.patch \
+ patches/jtreg-6929067-fix.patch \
+ patches/ia64-fix.patch \
+ patches/openjdk/7041156-gcc_export_dynamic.patch \
+ patches/openjdk/7032388-work_without_cmov_instruction.patch \
+ patches/openjdk/7031385-gcc-register-allocation-fix.patch \
+ patches/openjdk/7034464-transparent_huge_pages.patch \
+ patches/openjdk/7037939-disable_adaptive_resizing_with_large_pages.patch \
+ patches/openjdk/7043564-hugepage.patch \
+ patches/openjdk/6956668-misbehavior_of_XOR_operator_with_int.patch \
+ patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
+ patches/openjdk/6796786-invalid_FP_identity_transform.patch \
+ patches/openjdk/7042070-Typo_in_Test6796786.patch \
+ patches/jtreg-remove-test-6987555.patch \
+ patches/jtreg-remove-test-6991596.patch \
+ patches/openjdk/7036220-shark_llvm_29_headers.patch \
+ patches/openjdk/7029152-String_intrinsics_miss_optimization.patch \
+ patches/jtreg-hotspot-Test7020373-fix.patch \
+ patches/pr690-shark-jit-hs20.patch \
+ patches/pr696-zero-fast_aldc-hs20.patch \
+ patches/arm-debug.patch \
+ patches/openjdk/7010849-modernise_sa.patch
+endif
+
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/rhino.patch
@@ -571,7 +585,7 @@
patches/ecj/corba-dependencies.patch \
patches/ecj/jaxws-langtools-dependency.patch \
patches/ecj/jaxws-jdk-dependency.patch \
- patches/ecj/hotspot-jdk-dependency.patch
+ patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
@@ -654,7 +668,14 @@
DEBUG_BINARIES="true" \
ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
VERBOSE="$(VERBOSE)" \
- ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
+ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
+ STATIC_CXX="false"
+
+if WITH_ALT_HSBUILD
+ICEDTEA_ENV += \
+ BUILD_GCC=gcc$(GCC_SUFFIX) \
+ BUILD_CXX=g++$(GCC_SUFFIX)
+endif
if ENABLE_CACAO
ICEDTEA_ENV += \
diff -r a31bd9ed229b -r 06c8caca7d7c NEWS
--- a/NEWS Thu Feb 14 00:01:03 2013 +0000
+++ b/NEWS Fri Feb 15 00:02:19 2013 +0000
@@ -12,6 +12,11 @@
New in release 1.13.0 (201X-XX-XX):
+* New features
+ - PR1317: Provide an option to build with a more up-to-date HotSpot
+* Bug fixes
+ - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
+
New in release 1.12.2 (2013-02-11):
* Backports
diff -r a31bd9ed229b -r 06c8caca7d7c acinclude.m4
--- a/acinclude.m4 Thu Feb 14 00:01:03 2013 +0000
+++ b/acinclude.m4 Fri Feb 15 00:02:19 2013 +0000
@@ -716,9 +716,12 @@
AC_SUBST([$1])
])
-AC_DEFUN([IT_ENABLE_ZERO_BUILD],
+AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
[
AC_REQUIRE([IT_SET_ARCH_SETTINGS])
+ AC_REQUIRE([IT_ENABLE_CACAO])
+ AC_REQUIRE([IT_ENABLE_JAMVM])
+ AC_REQUIRE([IT_SET_SHARK_BUILD])
AC_MSG_CHECKING([whether to use the zero-assembler port])
use_zero=no
AC_ARG_ENABLE([zero],
@@ -794,7 +797,7 @@
AC_CONFIG_FILES([ergo.c])
])
-AC_DEFUN([IT_SET_SHARK_BUILD],
+AC_DEFUN_ONCE([IT_SET_SHARK_BUILD],
[
AC_MSG_CHECKING(whether to use the Shark JIT)
shark_selected=no
@@ -818,7 +821,7 @@
AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
])
-AC_DEFUN([IT_ENABLE_JAMVM],
+AC_DEFUN_ONCE([IT_ENABLE_JAMVM],
[
AC_MSG_CHECKING(whether to use JamVM as VM)
AC_ARG_ENABLE([jamvm],
@@ -857,7 +860,7 @@
AC_SUBST(ALT_JAMVM_SRC_ZIP)
])
-AC_DEFUN([IT_ENABLE_CACAO],
+AC_DEFUN_ONCE([IT_ENABLE_CACAO],
[
AC_MSG_CHECKING(whether to use CACAO as VM)
AC_ARG_ENABLE([cacao],
@@ -956,11 +959,16 @@
AC_SUBST([GCJ])
])
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
[
+ AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
ORIGINAL_BUILD="original"
- ALTERNATE_BUILD="original"
- DEFAULT_BUILD=${ORIGINAL_BUILD}
+ ALTERNATE_BUILD="hs23"
+ if test "x${use_zero}" = "xyes"; then
+ DEFAULT_BUILD=${ORIGINAL_BUILD}
+ else
+ DEFAULT_BUILD=${ALTERNATE_BUILD}
+ fi
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
@@ -978,6 +986,11 @@
AC_MSG_RESULT([${HSBUILD}])
AC_SUBST([HSBUILD])
AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${ORIGINAL_BUILD}")
+ if test "x${HSBUILD}" = "x${ALTERNATE_BUILD}" ; then
+ if test "x${use_zero}" = "xyes"; then
+ AC_MSG_ERROR([The ${ALTERNATE_BUILD} build of HotSpot is known not to work with Zero or Shark.])
+ fi
+ fi
])
AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP],
diff -r a31bd9ed229b -r 06c8caca7d7c hotspot.map
--- a/hotspot.map Thu Feb 14 00:01:03 2013 +0000
+++ b/hotspot.map Fri Feb 15 00:02:19 2013 +0000
@@ -1,1 +1,2 @@
# version url changeset sha256sum
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot bc0de5a0ece2 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068
diff -r a31bd9ed229b -r 06c8caca7d7c patches/arm-hsdis.patch
--- a/patches/arm-hsdis.patch Thu Feb 14 00:01:03 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-2012-01-20 Andrew Haley <aph at redhat.com>
-
- * Makefile (ARCH): Add entry for armv7l.
- (CFLAGS): Enable debugging.
- ($(LIBRARIES)): Pass CFLAGS to sub-make.
- * hsdis.c: Include string.h.
- (parse_caller_options): Fix strncmp bug.
- (native_arch_name): Add entry for ARM.
-
-diff -u openjdk/hotspot/src/share/tools/hsdis/hsdis.c ../icedtea6/openjdk/hotspot/src/share/tools/hsdis/hsdis.c
---- openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2011-11-14 17:07:33.000000000 -0500
-+++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2012-01-20 10:21:28.000000000 -0500
-@@ -22,8 +22,6 @@
- *
- */
-
--#include "precompiled.hpp"
--
- /* hsdis.c -- dump a range of addresses as native instructions
- This implements the plugin protocol required by the
- HotSpot PrintAssembly option.
-@@ -37,6 +35,8 @@
- #include <dis-asm.h>
- #include <inttypes.h>
-
-+#include <string.h>
-+
- #ifndef bool
- #define bool int
- #define true 1
-@@ -358,7 +358,7 @@
- if (plen > mach_size) plen = mach_size;
- strncpy(mach_option, p, plen);
- mach_option[plen] = '\0';
-- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) {
-+ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) {
- // do not pass these to the next level
- } else {
- /* just copy it; {i386,sparc}-dis.c might like to see it */
-@@ -420,6 +420,9 @@
- #ifdef LIBARCH_sparcv9
- res = "sparc:v9b";
- #endif
-+#ifdef LIBARCH_arm
-+ res = "arm";
-+#endif
- if (res == NULL)
- res = "architecture not set in Makefile!";
- return res;
-diff -u openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile
---- openjdk/hotspot/src/share/tools/hsdis/Makefile 2011-11-14 17:07:33.000000000 -0500
-+++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2012-01-20 10:20:32.000000000 -0500
-@@ -68,14 +68,18 @@
- CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW)
- else
- CPU = $(shell uname -m)
-+ifneq ($(findstring arm,$(CPU)),)
-+ARCH=arm
-+else
- ARCH1=$(CPU:x86_64=amd64)
- ARCH=$(ARCH1:i686=i386)
- CFLAGS/i386 += -m32
- CFLAGS/sparc += -m32
- CFLAGS/sparcv9 += -m64
- CFLAGS/amd64 += -m64
More information about the distro-pkg-dev
mailing list