Browse Source

Add support for compiling on aarch64 (64-bit ARM).

Closes #140.
accumulation-v4.7
t-nojiri 5 years ago
committed by Dave Parker
parent
commit
2cea964adf
  1. 11
      prism/Makefile
  2. 3
      prism/ext/lp_solve_5.5_java/lib/build
  3. 3
      prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc

11
prism/Makefile

@ -86,6 +86,9 @@ ifeq ($(OSTYPE),linux)
ifneq (,$(findstring ia64, $(shell uname -m)))
ARCH = ia64
endif
ifneq (,$(findstring aarch64, $(shell uname -m)))
ARCH = aarch64
endif
endif
# For Mac/Windows, we decide whether to build in 64-bit mode based on
# whether java is 32/64-bit (since these need to match)
@ -217,6 +220,13 @@ ifeq ($(OSTYPE),linux)
CXXFLAGS = --std=c++11 $(CFLAGS)
LDFLAGS = $(CFLAGS)
BINDISTSUFFIX = linux64
else
ifeq ($(ARCH),aarch64)
# Position Independent Code required on Aarch64
CFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(OPTIMISE) $(WARNINGS)
CXXFLAGS = --std=c++11 $(CFLAGS)
LDFLAGS = $(CFLAGS)
BINDISTSUFFIX = linux64
else
CFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(OPTIMISE) $(WARNINGS)
CXXFLAGS = --std=c++11 $(CFLAGS)
@ -224,6 +234,7 @@ ifeq ($(OSTYPE),linux)
BINDISTSUFFIX = linux32
endif
endif
endif
BIN_TARGETS=prism.linux xprism.linux
JFLAGS = -encoding UTF8
SHARED = -shared

3
prism/ext/lp_solve_5.5_java/lib/build

@ -29,6 +29,9 @@ fi
if [ "$ARCH" = "ia64" ]; then
CFLAGS="-fPIC -DPIC"
fi
if [ "$ARCH" = "aarch64" ]; then
CFLAGS="-fPIC -DPIC"
fi
#determine platform (32/64 bit)
>/tmp/platform.c

3
prism/ext/lpsolve55/src/lp_solve_5.5/lpsolve55/ccc

@ -11,6 +11,9 @@ fi
if [ "$ARCH" = "ia64" ]; then
CFLAGS="-fPIC -DPIC"
fi
if [ "$ARCH" = "aarch64" ]; then
CFLAGS="-fPIC -DPIC"
fi
#determine platform (32/64 bit)
>/tmp/platform.c

Loading…
Cancel
Save