diff options
| author | ruki <[email protected]> | 2022-05-20 23:01:13 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-05-20 23:01:13 +0800 |
| commit | 63db5dbd5ca3e7ed638d2c5e8ddd3ecf855f6aab (patch) | |
| tree | 2f1a348ab8b84b25d31060d416180b620670c820 /core | |
| parent | ac1ddeef8d1e976bd46ad34d12eb16bded52405e (diff) | |
fix compile errors
Diffstat (limited to 'core')
| -rw-r--r-- | core/plat/linux/prefix.mak | 13 | ||||
| -rw-r--r-- | core/plat/macosx/prefix.mak | 21 |
2 files changed, 16 insertions, 18 deletions
diff --git a/core/plat/linux/prefix.mak b/core/plat/linux/prefix.mak index 6cb4118c2..c97b67aad 100644 --- a/core/plat/linux/prefix.mak +++ b/core/plat/linux/prefix.mak @@ -40,7 +40,12 @@ AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(BUILD_ARCH)),- ifneq ($(AHFLAGS),) ifeq ($(CXFLAGS_CHECK),) CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } -CXFLAGS_CHECK := +ifeq ($(BUILD_ARCH),arm64) +CXFLAGS_CHECK := $(call CC_CHECK,-mfpu=neon,) +endif +ifeq ($(BUILD_ARCH),x86_64) +CXFLAGS_CHECK := $(call CC_CHECK,-msse -msse2 -msse3 -mavx -mavx2,) +endif export CXFLAGS_CHECK endif @@ -75,12 +80,6 @@ else CXFLAGS_RELEASE += -fomit-frame-pointer CXFLAGS_DEBUG += -fno-omit-frame-pointer endif -ifeq ($(BUILD_ARCH),x86_64) -CXFLAGS_RELEASE += -msse -msse2 -msse3 -mavx -mavx2 -endif -ifeq ($(BUILD_ARCH),arm64) -CXFLAGS_RELEASE += -mfpu=neon -endif # cflags: .c files CFLAGS_RELEASE = diff --git a/core/plat/macosx/prefix.mak b/core/plat/macosx/prefix.mak index f29315eda..e6a7a9865 100644 --- a/core/plat/macosx/prefix.mak +++ b/core/plat/macosx/prefix.mak @@ -28,7 +28,12 @@ PRE_ := $(if $(BIN),$(BIN)/$(PRE),xcrun -sdk macosx ) CC = $(PRE_)clang ifeq ($(CXFLAGS_CHECK),) CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } -CXFLAGS_CHECK := $(call CC_CHECK,-ftrapv,) +ifeq ($(BUILD_ARCH),arm64) +CXFLAGS_CHECK := $(call CC_CHECK,-mfpu=neon,) +endif +ifeq ($(BUILD_ARCH),x86_64) +CXFLAGS_CHECK := $(call CC_CHECK,-msse -msse2 -msse3 -mavx -mavx2,) +endif export CXFLAGS_CHECK endif @@ -36,7 +41,7 @@ endif LD = $(PRE_)clang ifeq ($(LDFLAGS_CHECK),) LD_CHECK = ${shell if $(LD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } -LDFLAGS_CHECK := $(call LD_CHECK,-ftrapv,) +LDFLAGS_CHECK := export LDFLAGS_CHECK endif @@ -56,7 +61,7 @@ MAKE = make -r # cxflags: .c/.cc/.cpp files, @note luajit cannot use -Oz, because it will panic CXFLAGS_RELEASE = -Os -fvisibility=hidden -fvisibility-inlines-hidden -flto CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -Qunused-arguments +CXFLAGS = -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -Qunused-arguments $(CXFLAGS_CHECK) CXFLAGS-I = -I CXFLAGS-o = -o @@ -65,13 +70,7 @@ ifeq ($(PROF),y) CXFLAGS += -g -fno-omit-frame-pointer else CXFLAGS_RELEASE += -fomit-frame-pointer -CXFLAGS_DEBUG += -fno-omit-frame-pointer $(CXFLAGS_CHECK) -endif -ifeq ($(BUILD_ARCH),x86_64) -CXFLAGS_RELEASE += -msse -msse2 -msse3 -mavx -mavx2 -endif -ifeq ($(BUILD_ARCH),arm64) -CXFLAGS_RELEASE += -mfpu=neon +CXFLAGS_DEBUG += -fno-omit-frame-pointer endif # cflags: .c files @@ -113,7 +112,7 @@ ifeq ($(PROF),y) MXFLAGS += -g -fno-omit-frame-pointer else MXFLAGS_RELEASE += -fomit-frame-pointer -MXFLAGS_DEBUG += -fno-omit-frame-pointer $(LDFLAGS_CHECK) +MXFLAGS_DEBUG += -fno-omit-frame-pointer endif # mflags: .m files |