Mercurial > hg > icedtea10
changeset 2572:616f6c1516c4
PR2409: Update Zero macro to match one in IcedTea 2.x
2015-06-08 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2409: Update Zero macro to match one in IcedTea 2.x
* NEWS: Updated.
2012-07-25 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2409: Update Zero macro to match one in IcedTea 2.x
* Makefile.am:
(download-openjdk): Echo HotSpot build being used.
* acinclude.m4:
(IT_ENABLE_ZERO_BUILD): Use AC_DEFUN_ONCE.
2013-09-09 Andrew John Hughes <gnu.andrew@redhat.com>
PR2409: Update Zero macro to match one in IcedTea 2.x
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Add -D_LITTLE_ENDIAN to arm
and support arm64|aarch64.
(IT_ENABLE_ZERO_BUILD): Explicitly set ZERO_BITSPERWORD
for aarch64, alpha, arm, ia64 && sh. Replace sparc64 with
sparcv9 which is what INSTALL_ARCH_DIR is set to.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 08 Jun 2015 06:49:47 +0100 |
| parents | 7cb23ee6d362 |
| children | 7e7422478975 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 08 06:14:14 2015 +0100 +++ b/ChangeLog Mon Jun 08 06:49:47 2015 +0100 @@ -1,3 +1,26 @@ +2015-06-08 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2409: Update Zero macro to match one in IcedTea 2.x + * NEWS: Updated. + +2012-07-25 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2409: Update Zero macro to match one in IcedTea 2.x + * Makefile.am: + (download-openjdk): Echo HotSpot build being used. + * acinclude.m4: + (IT_ENABLE_ZERO_BUILD): Use AC_DEFUN_ONCE. + +2013-09-09 Andrew John Hughes <gnu.andrew@redhat.com> + + PR2409: Update Zero macro to match one in IcedTea 2.x + * acinclude.m4: + (IT_SET_ARCH_SETTINGS): Add -D_LITTLE_ENDIAN to arm + and support arm64|aarch64. + (IT_ENABLE_ZERO_BUILD): Explicitly set ZERO_BITSPERWORD + for aarch64, alpha, arm, ia64 && sh. Replace sparc64 with + sparcv9 which is what INSTALL_ARCH_DIR is set to. + 2015-06-08 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2408: Enable Zero when Shark is enabled
--- a/Makefile.am Mon Jun 08 06:14:14 2015 +0100 +++ b/Makefile.am Mon Jun 08 06:49:47 2015 +0100 @@ -915,6 +915,7 @@ if USE_ALT_HOTSPOT_SRC_ZIP ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP) endif + echo "Using HotSpot build: ${HSBUILD}" if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \
--- a/NEWS Mon Jun 08 06:14:14 2015 +0100 +++ b/NEWS Mon Jun 08 06:49:47 2015 +0100 @@ -77,6 +77,7 @@ - PR2383: Location of docs directory in install-data-local is incorrect - PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM - PR2408: Enable Zero when Shark is enabled + - PR2409: Update Zero macro to match one in IcedTea 2.x - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck
--- a/acinclude.m4 Mon Jun 08 06:14:14 2015 +0100 +++ b/acinclude.m4 Mon Jun 08 06:49:47 2015 +0100 @@ -23,6 +23,13 @@ BUILD_ARCH_DIR=arm INSTALL_ARCH_DIR=arm JRE_ARCH_DIR=arm + ARCHFLAG="-D_LITTLE_ENDIAN" + ;; + arm64|aarch64) + BUILD_ARCH_DIR=aarch64 + INSTALL_ARCH_DIR=aarch64 + JRE_ARCH_DIR=aarch64 + ARCHFLAG="-D_LITTLE_ENDIAN" ;; mips) BUILD_ARCH_DIR=mips @@ -609,7 +616,7 @@ 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]) @@ -649,10 +656,10 @@ ZERO_LIBARCH="${INSTALL_ARCH_DIR}" dnl can't use AC_CHECK_SIZEOF on multilib case "${ZERO_LIBARCH}" in - i386|ppc|s390|sparc) + arm|i386|ppc|s390|sh|sparc) ZERO_BITSPERWORD=32 ;; - amd64|ppc64|s390x|sparc64) + aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9) ZERO_BITSPERWORD=64 ;; *)