Mercurial > hg > icedtea9
changeset 2574:b2ab294380e5
PR2411: Fix references to hotspot.map following PR2001
2014-09-16 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2411: Fix references to hotspot.map following PR2001
* Makefile.am:
(HS_TYPE): Fix hotspot.map path.
(HS_URL): Likewise.
(HS_CHANGESET): Likewise.
(HS_SHA256SUM): Likewise.
(EXTRA_DIST): Remove hotspot.map.
hotspot.map.in is automatically added
by autoconf.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 08 Jun 2015 07:48:28 +0100 |
| parents | 7e7422478975 |
| children | eef478c09a51 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 08 07:42:06 2015 +0100 +++ b/ChangeLog Mon Jun 08 07:48:28 2015 +0100 @@ -1,3 +1,16 @@ +2014-09-16 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2411: Fix references to hotspot.map following PR2001 + * Makefile.am: + (HS_TYPE): Fix hotspot.map path. + (HS_URL): Likewise. + (HS_CHANGESET): Likewise. + (HS_SHA256SUM): Likewise. + (EXTRA_DIST): Remove hotspot.map. + hotspot.map.in is automatically added + by autoconf. + * NEWS: Updated. + 2014-05-01 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2410: Support PPC64 JIT on ppc64le
--- a/Makefile.am Mon Jun 08 07:42:06 2015 +0100 +++ b/Makefile.am Mon Jun 08 07:48:28 2015 +0100 @@ -20,10 +20,10 @@ OPENJDK_SHA256SUM = b915757c7c17448c670e93b7b9885e46afad43fbf6585c2e0f9d3582237a8bd7 NASHORN_SHA256SUM = b85c66df90280d529894563ab774968a462a57ad9568d8a2ab31a7f897cbe1e2 -HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" -HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" -HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" -HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" +HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" +HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" +HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" +HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`" DROP_URL = http://icedtea.classpath.org/download/drops @@ -556,9 +556,8 @@ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/jamvm/*.patch \ tools-copy contrib overlays \ - $(JTREG_SRCS) $(DESKTOP_FILES) \ - HACKING $(PULSEAUDIO_SRCS) fsg.sh \ - hotspot.map autogen.sh \ + $(JTREG_SRCS) $(DESKTOP_FILES) HACKING \ + $(PULSEAUDIO_SRCS) fsg.sh autogen.sh \ tapset/hotspot.stp.in \ tapset/hotspot_jni.stp.in \ scripts/jni_create_stap.c \
--- a/NEWS Mon Jun 08 07:42:06 2015 +0100 +++ b/NEWS Mon Jun 08 07:48:28 2015 +0100 @@ -79,6 +79,7 @@ - PR2408: Enable Zero when Shark is enabled - 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 - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck