ARM32 build fails after JDK-8230199

/home/build/jdk-jdk$ make CONF=linux-arm-server-release
Building target 'default (exploded-image)' in configuration 'linux-arm-server-release'
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:54:27: error: 'int_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::int_parm, // bool
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:55:27: error: 'int_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::int_parm, // byte
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:56:27: error: 'int_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::int_parm, // char
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:57:27: error: 'int_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::int_parm, // short
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:58:27: error: 'int_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::int_parm, // int
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:59:27: error: 'long_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::long_parm, // long
                           ^~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:64:27: error: 'float_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::float_parm, // float
                           ^~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:65:27: error: 'double_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::double_parm, // double
                           ^~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:67:27: error: 'obj_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::obj_parm, // obj
                           ^~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:68:27: error: 'done_parm' is not a member of 'SignatureIterator'
   (u1) SignatureIterator::done_parm // done
                           ^~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp: In static member function 'static uint64_t InterpreterRuntime::normalize_fast_native_fingerprint(uint64_t)':
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:76:34: error: 'static_feature_size' is not a member of 'SignatureIterator'
   int shift = SignatureIterator::static_feature_size;
                                  ^~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:80:70: error: 'result_feature_mask' is not a member of 'SignatureIterator'
   BasicType ret_type = (BasicType) (fingerprint & SignatureIterator::result_feature_mask);
                                                                      ^~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:93:31: error: 'result_feature_size' is not a member of 'SignatureIterator'
   shift += SignatureIterator::result_feature_size;
                               ^~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:94:38: error: 'result_feature_size' is not a member of 'SignatureIterator'
   fingerprint >>= SignatureIterator::result_feature_size;
                                      ^~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:97:66: error: 'parameter_feature_mask' is not a member of 'SignatureIterator'
     uint32_t type = (uint32_t) (fingerprint & SignatureIterator::parameter_feature_mask);
                                                                  ^~~~~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:98:36: error: 'done_parm' is not a member of 'SignatureIterator'
     if (type == SignatureIterator::done_parm) {
                                    ^~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:99:48: error: 'done_parm' is not a member of 'SignatureIterator'
       result |= ((uint64_t) SignatureIterator::done_parm) << shift;
                                                ^~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:103:56: error: 'bool_parm' is not a member of 'SignatureIterator'
     int shared = shared_type[type - SignatureIterator::bool_parm];
                                                        ^~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:105:33: error: 'parameter_feature_size' is not a member of 'SignatureIterator'
     shift += SignatureIterator::parameter_feature_size;
                                 ^~~~~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:106:40: error: 'parameter_feature_size' is not a member of 'SignatureIterator'
     fingerprint >>= SignatureIterator::parameter_feature_size;
                                        ^~~~~~~~~~~~~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp: In member function 'void InterpreterRuntime::SignatureHandlerGenerator::generate(uint64_t)':
/home/build/jdk-jdk/src/hotspot/cpu/arm/interpreterRT_arm.cpp:225:69: error: no matching function for call to 'InterpreterRuntime::SignatureHandlerGenerator::return_type(uint64_t&)'
   BasicType result_type = SignatureIterator::return_type(fingerprint);
                                                                     ^
In file included from /home/build/jdk-jdk/src/hotspot/share/classfile/systemDictionary.hpp:34,
                 from /home/build/jdk-jdk/src/hotspot/share/classfile/javaClasses.hpp:28,
                 from /home/build/jdk-jdk/src/hotspot/share/precompiled/precompiled.hpp:35:
/home/build/jdk-jdk/src/hotspot/share/runtime/signature.hpp:236:13: note: candidate: 'BasicType SignatureIterator::return_type()'
   BasicType return_type(); // computes the value on the fly if necessary
             ^~~~~~~~~~~
/home/build/jdk-jdk/src/hotspot/share/runtime/signature.hpp:236:13: note: candidate expects 0 arguments, 1 provided