Merge pull request #164 from ibmruntimes/openj9

Merge OpenJ9 change to 0.36

Author: JasonFengJ9

src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ppc64/TypeClass.java

@@ -53,10 +53,6 @@ public enum TypeClass {
 	POINTER,
 	STRUCT;
 
-	private static String osName = System.getProperty("os.name").toLowerCase();
-	/* long long is 64 bits on AIX/ppc64, which is the same as Windows */
-	private static ValueLayout longLayout = osName.contains("aix") ? C_LONG_LONG : C_LONG;
-
 	public static VarHandle classifyVarHandle(ValueLayout layout) {
 		VarHandle argHandle = null;
 		Class<?> carrier = classifyCarrier(layout);
@@ -69,7 +65,7 @@ public static VarHandle classifyVarHandle(ValueLayout layout) {
 			|| (carrier == int.class)
 			|| (carrier == long.class)
 		) {
-			argHandle = SharedUtils.vhPrimitiveOrAddress(long.class, longLayout);
+			argHandle = SharedUtils.vhPrimitiveOrAddress(long.class, C_LONG_LONG);
 		} else if (carrier == float.class) {
 			argHandle = SharedUtils.vhPrimitiveOrAddress(double.class, C_DOUBLE);
 		} else if ((carrier == double.class)

src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/s390x/sysv/TypeClass.java

@@ -95,7 +95,7 @@ static VarHandle classifyVarHandle(MemoryLayout layout) {
 			|| (carrier == int.class)
 			|| (carrier == long.class)
 		) {
-			argHandle = SharedUtils.vhPrimitiveOrAddress(long.class, C_LONG);
+			argHandle = SharedUtils.vhPrimitiveOrAddress(long.class, C_LONG_LONG);
 		} else if ((carrier == float.class)
 			|| (carrier == double.class)
 		) {