--- old/src/hotspot/share/utilities/macros.hpp	2018-09-25 19:24:00.000000000 +0300
+++ new/src/hotspot/share/utilities/macros.hpp	2018-09-25 19:24:00.000000000 +0300
@@ -541,10 +541,11 @@
 #define NOT_E500V2(code) code
 #endif
 
-// Note: There are three ARM ports. They set the following in the makefiles:
+// Note: There are four ARM ports. They set the following in the makefiles:
 // 1. Closed 32-bit port:   -DARM -DARM32           -DTARGET_ARCH_arm
 // 2. Closed 64-bit port:   -DARM -DAARCH64 -D_LP64 -DTARGET_ARCH_arm
 // 3. Open   64-bit port:         -DAARCH64 -D_LP64 -DTARGET_ARCH_aaarch64
+// 4. Open   32-bit port:         -DAARCH32         -DTARGET_ARCH_aarch32
 #ifdef ARM
 #define ARM_ONLY(code) code
 #define NOT_ARM(code)
@@ -577,6 +578,14 @@
 #define BIG_ENDIAN_ONLY(code) code
 #endif
 
+#ifdef AARCH32
+#define AARCH32_ONLY(code) code
+#define NOT_AARCH32(code)
+#else
+#define AARCH32_ONLY(code)
+#define NOT_AARCH32(code) code
+#endif
+
 #define define_pd_global(type, name, value) const type pd_##name = value;
 
 // Helper macros for constructing file names for includes.