Skip to content

Commit

Permalink
Support ARCH=armv8 in Makefile (#2355)
Browse files Browse the repository at this point in the history
Tested with bench run after compiling with

- g++ (Debian 6.3.0-18+deb9u1) 6.3.0 20170516
- clang version 3.8.1-24

on ThunderX CN8890.

closes #2760

fixes #2355

No functional change.
  • Loading branch information
niklasf authored and vondele committed Jun 24, 2020
1 parent bbe9857 commit 527d832
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ ifeq ($(ARCH),armv7)
prefetch = yes
endif

ifeq ($(ARCH),armv8)
arch = armv8-a
bits = 64
prefetch = yes
endif

ifeq ($(ARCH),ppc-32)
arch = ppc
endif
Expand Down Expand Up @@ -164,7 +170,7 @@ ifeq ($(COMP),gcc)
CXX=g++
CXXFLAGS += -pedantic -Wextra -Wshadow

ifeq ($(ARCH),armv7)
ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
ifeq ($(OS),Android)
CXXFLAGS += -m$(bits)
LDFLAGS += -m$(bits)
Expand Down Expand Up @@ -221,7 +227,7 @@ ifeq ($(COMP),clang)
endif
endif

ifeq ($(ARCH),armv7)
ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
ifeq ($(OS),Android)
CXXFLAGS += -m$(bits)
LDFLAGS += -m$(bits)
Expand Down Expand Up @@ -391,6 +397,7 @@ help:
@echo "ppc-64 > PPC 64-bit"
@echo "ppc-32 > PPC 32-bit"
@echo "armv7 > ARMv7 32-bit"
@echo "armv8 > ARMv8 64-bit"
@echo "general-64 > unspecified 64-bit"
@echo "general-32 > unspecified 32-bit"
@echo ""
Expand Down Expand Up @@ -492,7 +499,8 @@ config-sanity:
@test "$(sanitize)" = "undefined" || test "$(sanitize)" = "thread" || test "$(sanitize)" = "address" || test "$(sanitize)" = "no"
@test "$(optimize)" = "yes" || test "$(optimize)" = "no"
@test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \
test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7"
test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || \
test "$(arch)" = "armv7" || test "$(arch)" = "armv8-a"
@test "$(bits)" = "32" || test "$(bits)" = "64"
@test "$(prefetch)" = "yes" || test "$(prefetch)" = "no"
@test "$(popcnt)" = "yes" || test "$(popcnt)" = "no"
Expand Down

0 comments on commit 527d832

Please sign in to comment.