Merge of PPC port into IcedTea 2.x for OpenJDK 7

[Lindenmaier, Goetz]

Hi Andrew,

> A few merge issues,  but I eventually got it in:
Great!  
I'll pull some changes to ppc-aix-port/jdk7u, so that the diffs
to the jdk8/9 port are reduced.

jdk8/jdk8 is the jdk8 to be released in March.  ppc does not go there.
jdk8u/... will at some point in the future contain the port.
jdk9/hs-dev already contains the port, it will soon be transported to 
     all jdk9/ repos.

Best regards,
  Goetz.

-----Original Message-----
From: Andrew Hughes [mailto:gnu.andrew at redhat.com] 
Sent: Mittwoch, 5. Februar 2014 13:36
To: Volker Simonis
Cc: Lindenmaier, Goetz; ppc-aix-port-dev at openjdk.java.net
Subject: Re: Merge of PPC port into IcedTea 2.x for OpenJDK 7



----- Original Message -----
> On Tuesday, February 4, 2014, Andrew Hughes <gnu.andrew at redhat.com> wrote:
> 
> > ----- Original Message -----
> > > Hi Andrew,
> > >
> > > in jdk8/9 we changed the line in elfSymbolTable.cpp to
> > >         if (sym_addr <= addr && (Elf_Word)(addr - sym_addr) < st_size) {
> >
> > Ah, yeah that looks like the fix I need :)
> >
> > Still a bit baffled because, AFAICS, elf.h defines both Elf32_Word and
> > Elf64_Word as unsigned 32-bit integers, so I imagine the difference is in
> > the result of (addr - sym_addr) (i.e. the type of address).
> >
> > Funny, I was just pulling the jdk9 repos as I saw this. It doesn't seem
> > to have appeared in 8 yet.
> 
> 
> The situation is a little complicated:)
> 
> ppc-aix-port/jdk8 and ppc-aix-port/stage-9 are closed.
> 
> ppc-aix-port/stage was initially used to hold the reviewed (and potentially
> modified) changes of ppc-aix-port/jdk8. Later, ppc-aix-port/stage-9 was
> cloned from ppc-aix-port/stage and synced with jdk9/dev until we finally
> merged it into jdk9/dev (jdk part) and jdk9/hs-comp (complete port).
> 
> So currently, jdk9/hs-comp contains the most up to date version of the
> port. ppc-aix-port/stage is just a little behind. It is synced against
> jdk8/jdk8u and will be finally merged into it. This is planned for March
> and should be early enough such that the port will make it into 8u20. After
> that merge ppc-aix-port/stage will be closed as well.

A few merge issues,  but I eventually got it in:

http://icedtea.classpath.org/hg/icedtea7-forest/hotspot

The change was taken from jdk9/hs-comp and then manually merged with the version
already in 7u. I was looking at jdk8/jdk8 but I guess this is dead now, and
just exists to confuse people like jdk7/jdk7...

Thanks,
-- 
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