Add aarch64 to list of supported archs

Signed-off-by: [email protected] <[email protected]>
adoptium · Mar 6, 2019 · 4166295 · 4166295
1 parent ba8f6d8
commit 4166295
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/openj9.build/include/top.xml b/openj9.build/include/top.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2017, 2018 IBM Corp.
+Copyright (c) 2017, 2018, 2019 IBM Corp.
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License 2.0 which accompanies this distribution
@@ -510,6 +510,16 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 					<contains string="@{arch}" substring="arm"/>
 				</and>
 			</condition>
+			<condition property="@{property}" value="aarch32">
+				<and>
+					<contains string="@{arch}" substring="aarch32"/>
+				</and>
+			</condition>
+			<condition property="@{property}" value="aarch64">
+				<and>
+					<contains string="@{arch}" substring="aarch64"/>
+				</and>
+			</condition>
 			<condition property="@{property}" value="ia">
 				<and>
 					<contains string="@{arch}" substring="IA64"/>

diff --git a/openj9.test.sharedClasses.jvmti/src/native/Makefile b/openj9.test.sharedClasses.jvmti/src/native/Makefile
@@ -1,5 +1,5 @@
 #################################################################################
-# Copyright (c) 2017, 2018 IBM Corp.
+# Copyright (c) 2017, 2018, 2019 IBM Corp.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which accompanies this distribution
@@ -61,7 +61,7 @@ P=:
 ###
 # Check platform is set to a single valid value
 ###
-VALID_PLATFORMS?=aix_ppc-32,aix_ppc-64,linux_390-31,linux_390-64,linux_ppc-32,linux_ppc-64,linux_x86-32,linux_x86-64,win_x86-32,win_x86-64,zos_390-31,zos_390-64,linux_ppcle-64,linux_arm-32,osx_x86-64
+VALID_PLATFORMS?=aix_ppc-32,aix_ppc-64,linux_390-31,linux_390-64,linux_ppc-32,linux_ppc-64,linux_x86-32,linux_x86-64,win_x86-32,win_x86-64,zos_390-31,zos_390-64,linux_ppcle-64,linux_arm-32,linux_aarch64-64,osx_x86-64
 ifndef PLATFORM
   $(error "The variable PLATFORM needs to be defined")
 endif
@@ -142,6 +142,18 @@ ifeq ($(PLATFORM),linux_x86-64)
     IFLAGS=-I. -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/linux -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include
 endif
 
+ifeq ($(PLATFORM),linux_arm-32)
+    CFLAGS=-fPIC -fno-omit-frame-pointer -static-libgcc -O0 -g3 -pedantic -Wall -std=c99 -c -fPIC -D_JNI_IMPLEMENTATION_ -D_TRIVIAL_AGENT -DOS64 -o $(OBJDIR)/sharedClasses$(OSUFFIX)
+    LFLAGS=-shared -o 
+    IFLAGS=-I. -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/linux -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include
+endif
+
+ifeq ($(PLATFORM),linux_aarch64-64)
+    CFLAGS=-fPIC -fno-omit-frame-pointer -static-libgcc -O0 -g3 -pedantic -Wall -std=c99 -c -fPIC -D_JNI_IMPLEMENTATION_ -D_TRIVIAL_AGENT -DOS64 -o $(OBJDIR)/sharedClasses$(OSUFFIX)
+    LFLAGS=-shared -o 
+    IFLAGS=-I. -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/linux -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include
+endif
+
 ifeq ($(PLATFORM),osx_x86-64)
     CFLAGS=-fPIC -fno-omit-frame-pointer -O0 -g3 -pedantic -Wall -std=c99 -c -D_JNI_IMPLEMENTATION_ -D_TRIVIAL_AGENT -DOS64 -o $(OBJDIR)/sharedClasses$(OSUFFIX)
     LFLAGS=-shared -o