From 6e1bbe8be89349038995df2aaa4f11019439e39e Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 18 Jan 2021 01:42:28 +1100 Subject: -osd: Clean up inline maths utilities. * Removed inline assembly for operations compilers handle well. * Added ARM and AArch64 implementation for a few operations. * Added unsigned integer add with carry out operations. -cpu/drccache.cpp: Detect whether RWX pages are supported. -dynax.cpp: Improved a few hanafuda DIP switch descriptions. --- makefile | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index b30b921b352..96de8f7e69f 100644 --- a/makefile +++ b/makefile @@ -362,58 +362,46 @@ WINDRES := $(word 1,$(TOOLCHAIN) i686-w64-mingw32-)windres endif endif -ifeq ($(findstring arm,$(UNAME)),arm) -ARCHITECTURE := -ifndef NOASM - NOASM := 1 -endif -endif - -ifeq ($(findstring aarch64,$(UNAME)),aarch64) +# Emscripten +ifeq ($(findstring emcc,$(CC)),emcc) +TARGETOS := asmjs ARCHITECTURE := ifndef NOASM NOASM := 1 endif endif -ifeq ($(findstring s390x,$(UNAME)),s390x) -ifndef NOASM - NOASM := 1 +ifeq ($(findstring ppc,$(UNAME)),ppc) +ifndef FORCE_DRC_C_BACKEND + FORCE_DRC_C_BACKEND := 1 endif endif -ifeq ($(findstring riscv64,$(UNAME)),riscv64) -ARCHITECTURE := -ifndef NOASM - NOASM := 1 +ifeq ($(findstring powerpc,$(UNAME)),powerpc) +ifndef FORCE_DRC_C_BACKEND + FORCE_DRC_C_BACKEND := 1 endif endif -# Emscripten -ifeq ($(findstring emcc,$(CC)),emcc) -TARGETOS := asmjs -ARCHITECTURE := -ifndef NOASM - NOASM := 1 +ifeq ($(findstring arm,$(UNAME)),arm) +ifndef FORCE_DRC_C_BACKEND + FORCE_DRC_C_BACKEND := 1 endif endif -# ppc has inline assembly support but no DRC -ifeq ($(findstring ppc,$(UNAME)),ppc) +ifeq ($(findstring aarch64,$(UNAME)),aarch64) ifndef FORCE_DRC_C_BACKEND FORCE_DRC_C_BACKEND := 1 endif endif -# powerpc has inline assembly support but no DRC -ifeq ($(findstring powerpc,$(UNAME)),powerpc) +ifeq ($(findstring s390x,$(UNAME)),s390x) ifndef FORCE_DRC_C_BACKEND - FORCE_DRC_C_BACKEND := 1 + FORCE_DRC_C_BACKEND := 1 endif endif -# ARM / ARM64 -ifeq ($(findstring arm,$(UNAME)),arm) +ifeq ($(findstring riscv64,$(UNAME)),riscv64) ifndef FORCE_DRC_C_BACKEND FORCE_DRC_C_BACKEND := 1 endif -- cgit v1.2.3