Mercurial > hg > icedtea9
changeset 2577:e383106102c8
PR2413: OpenJDK doesn't auto-select Zero on architectures where no server JVM is available
2015-06-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2413: OpenJDK doesn't auto-select Zero on
architectures where no server JVM is available
* Makefile.am:
(ICEDTEA_ZERO_BUILD): Removed.
(ICEDTEA_SHARK_BUILD): Likewise.
(ICEDTEA_CONFIGURE): Pass zero
or zeroshark as appropriate to
--with-jvm-variants in OpenJDK configure.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 15 Jun 2015 16:31:23 +0100 |
| parents | 40028a1dbc12 |
| children | aecf66878c91 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 23 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 15 15:55:52 2015 +0100 +++ b/ChangeLog Mon Jun 15 16:31:23 2015 +0100 @@ -1,3 +1,15 @@ +2015-06-15 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2413: OpenJDK doesn't auto-select Zero on + architectures where no server JVM is available + * Makefile.am: + (ICEDTEA_ZERO_BUILD): Removed. + (ICEDTEA_SHARK_BUILD): Likewise. + (ICEDTEA_CONFIGURE): Pass zero + or zeroshark as appropriate to + --with-jvm-variants in OpenJDK configure. + * NEWS: Updated. + 2015-06-15 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be
--- a/Makefile.am Mon Jun 15 15:55:52 2015 +0100 +++ b/Makefile.am Mon Jun 15 16:31:23 2015 +0100 @@ -274,13 +274,6 @@ ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES) # OpenJDK build environment. -if ZERO_BUILD - ICEDTEA_ZERO_BUILD = true -endif -if SHARK_BUILD - ICEDTEA_SHARK_BUILD = true -endif - ICEDTEA_NAME = IcedTea if HAS_ICEDTEA_REVISION ICEDTEA_REV = +${ICEDTEA_REVISION} @@ -351,13 +344,21 @@ --with-giflib=bundled endif +if ZERO_BUILD +ICEDTEA_CONFIGURE += \ + --with-jvm-variants=zero +endif + +if SHARK_BUILD +ICEDTEA_CONFIGURE += \ + --with-jvm-variants=zeroshark +endif + ICEDTEA_ENV = \ LANG="C" \ PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ - ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ - SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \ ZERO_LIBARCH="$(ZERO_LIBARCH)" \ ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \ ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
--- a/NEWS Mon Jun 15 15:55:52 2015 +0100 +++ b/NEWS Mon Jun 15 16:31:23 2015 +0100 @@ -101,6 +101,7 @@ - PR2409: Update Zero macro to match one in IcedTea 2.x - PR2410: Support PPC64 JIT on ppc64le - PR2411: Fix references to hotspot.map following PR2001 + - PR2413: OpenJDK doesn't auto-select Zero on architectures where no server JVM is available - PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be passed to OpenJDK build - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build.