[1.11] Backport PR886 to 1.11

[Andrew Hughes]

----- Original Message -----
> 2012-05-09 16:05, Dr Andrew John Hughes skrev:
> > 1.11 includes a fix for CACAO that allows it to build on ARM by
> > providing
> > a jvm.cfg file for it.  The same issue that this patch solves still
> > exists
> > on other platforms e.g. PPC, as that fix is architecture-specific.
> > 
> > I added a fix a while back to HEAD which generalises the fix,
> > applying it
> > to all CACAO builds and this has been added to the Gentoo builds of
> > 1.11
> > as well.  I'd like to backport it to the 1.11 branch for the
> > upcoming release.
> > This allows CACAO to build on PPC and fixes:
> > 
> > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=886
> > 
> > 2012-03-16  Andrew John Hughes  <ahughes at redhat.com>
> > 
> > 	PR600, 886:
> > 	* patches/pr600-arm-jvm.cfg.patch: Removed.
> > 	* Makefile.am:
> > 	(extract-openjdk): Copy jvm.cfg over if building cacao.
> > 	* acinclude.m4:
> > 	(IT_ENABLE_CACAO): Generate jvm.cacao.cfg.
> > 	* jvm.cacao.cfg.in: Copied from jvm.cfg.in.
> > 
> > Patch against 1.11 is attached.  Ok for the 1.11 branch?
> 
> This patch alone will, apart from fixing CACAO builds, break the
> PPC/ARM JamVM builds.
> please backport
> http://icedtea.classpath.org/hg/icedtea6/rev/8b157b07b859
> as well to make both JamVM and CACAO builds work on PPC and ARM using
> 1.11.
> 

Yes, well spotted.  That was coming next, honest! :-)

I like to keep a 1:1 relationship between patches on HEAD and branches.

> I am ok for this patch to go in as long as the extend fix to cover
> JamVM on all archs also gets backported to 1.11.
> 
> Cheers
> Xerxes
> 
> 

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07