Kulla build broken on Mac

[Ben Evans]

Hi,

The current tip of kulla/dev appears to be broken on Mac 10.9.

Running make images gives 61 errors, all of the form:

/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CMSBitMap.java:77:
error: reference to VirtualSpace is ambiguous
  public VirtualSpace virtualSpace() {
         ^
  both class sun.jvm.hotspot.runtime.VirtualSpace in
sun.jvm.hotspot.runtime and class sun.jvm.hotspot.memory.VirtualSpace
in sun.jvm.hotspot.memory match
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java:38:
error: reference to CompactibleSpace is ambiguous
public class CompactibleFreeListSpace extends CompactibleSpace {
                                              ^
  both class sun.jvm.hotspot.memory.CompactibleSpace in
sun.jvm.hotspot.memory and class
sun.jvm.hotspot.gc.shared.CompactibleSpace in
sun.jvm.hotspot.gc.shared match
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/shared/Generation.java:184:
error: reference to VirtualSpace is ambiguous
  protected VirtualSpace virtualSpace() {
            ^
  both class sun.jvm.hotspot.runtime.VirtualSpace in
sun.jvm.hotspot.runtime and class sun.jvm.hotspot.memory.VirtualSpace
in sun.jvm.hotspot.memory match
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java:396:
error: reference to SpaceClosure is ambiguous
  private class LiveRegionsCollector implements SpaceClosure {
                                                ^
  both interface sun.jvm.hotspot.memory.SpaceClosure in
sun.jvm.hotspot.memory and interface
sun.jvm.hotspot.gc.shared.SpaceClosure in sun.jvm.hotspot.gc.shared
match
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java:401:
error: reference to Space is ambiguous
     public void doSpace(Space s) {
                         ^
  both class sun.jvm.hotspot.memory.Space in sun.jvm.hotspot.memory
and class sun.jvm.hotspot.gc.shared.Space in sun.jvm.hotspot.gc.shared
match
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java:208:
error: reference to Generation is ambiguous
   private void printGen(Generation gen) {
                         ^
  both class sun.jvm.hotspot.memory.Generation in
sun.jvm.hotspot.memory and class sun.jvm.hotspot.gc.shared.Generation
in sun.jvm.hotspot.gc.shared match

or:

/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java:84:
error: cannot find symbol
                                 collectorField.getValue(addr));
                                                         ^
  symbol:   variable addr
  location: class CompactibleFreeListSpace
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java:88:
error: cannot find symbol
     return capacity() - used0();
            ^
  symbol:   method capacity()
  location: class CompactibleFreeListSpace
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java:92:
error: cannot find symbol
     return capacity() - free();
            ^
  symbol:   method capacity()
  location: class CompactibleFreeListSpace
/Users/boxcat/projects/openjdk/kulla/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc/cms/CompactibleFreeListSpace.java:108:
error: cannot find symbol
      Address cur = addr.addOffsetTo( indexedFreeListField.getOffset() );
                    ^
  symbol:   variable addr
  location: class CompactibleFreeListSpace

My current hg tip is:

$ hg tip
changeset:   1522:bd5e490ebc9e
tag:         tip
user:        jlahoda
date:        Tue Jun 02 09:17:20 2015 +0200
summary:     jline should be without warnings

Any ideas?

Thanks,

Ben