[aarch64-port-dev ] aarch64 build is broken

[Johnson, E Andrew]

After updating to the most recent sources (either jdk9/dev or jdk9/hs-comp), I am getting the following error:
macroAssembler_aarch64.o: In function `MacroAssembler::patch_oop(unsigned char*, unsigned char*)':
$HOME/openjdk/jdk9/dev/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp:168: undefined reference to `oopDesc::encode_heap_oop(oopDesc*)'
collect2: error: ld returned 1 exit status
make[8]: *** [libjvm.so] Error 1

The source line in question has not changed since the last successful build, so something changed in some other checkin that is causing this error.  Has anyone else encountered this problem?  It is failing on both a native aarch64 build and also on a cross_compile build on x86_64.

-AndyJ