Skip to content
Browse files

Merge pull request #113 from cmagina/master

Added aarch64 build support
  • Loading branch information...
2 parents f761f10 + 5dc97e9 commit 5e360bdefd8923280b1a0234b845448050bf0caa @sjlee sjlee committed May 20, 2016
Showing with 12 additions and 2 deletions.
  1. +4 −1 src/main/native/Makefile.am
  2. +5 −1 src/main/native/Makefile.in
  3. +3 −0 src/main/native/config/config.guess
View
5 src/main/native/Makefile.am
@@ -17,7 +17,10 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(srcdir)/impl -Isrc/com/hadoop/compression/lzo
AM_LDFLAGS = @JNI_LDFLAGS@
-AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
+AM_CFLAGS = -g -Wall -fPIC -O2
+ifneq ($(OS_ARCH),aarch64)
+ AM_CFLAGS += -m$(JVM_DATA_MODEL)
+endif
# Define the libaries that need to be built
lib_LTLIBRARIES = libgplcompression.la
View
6 src/main/native/Makefile.in
@@ -228,7 +228,11 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(srcdir)/impl -Isrc/com/hadoop/compression/lzo
AM_LDFLAGS = @JNI_LDFLAGS@
-AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
+AM_CFLAGS = -g -Wall -fPIC -O2
+ifneq ($(OS_ARCH),aarch64)
+ AM_CFLAGS += -m$(JVM_DATA_MODEL)
+endif
+
# Define the libaries that need to be built
lib_LTLIBRARIES = libgplcompression.la
View
3 src/main/native/config/config.guess
@@ -844,6 +844,9 @@ EOF
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit 0 ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit 0 ;;
cris:Linux:*:*)
echo cris-axis-linux-${LIBC}
exit 0 ;;

0 comments on commit 5e360bd

Please sign in to comment.
Something went wrong with that request. Please try again.