Skip to content

Commit 8d91fbd

Browse files
committed
drop the unused HAVE_NEON
only results in confusion like in #899
1 parent 83b070a commit 8d91fbd

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

Makefile.libretro

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ else ifneq (,$(findstring CortexA73_G12B,$(platform)))
166166
fpic := -fPIC
167167
ARCH = arm64
168168
BUILTIN_GPU = neon
169-
HAVE_NEON = 1
170169
DYNAREC = ari64
171170
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
172171
CFLAGS += -march=armv8-a+crc -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
@@ -177,7 +176,6 @@ else ifneq (,$(findstring h5,$(platform)))
177176
fpic := -fPIC
178177
ARCH = arm64
179178
BUILTIN_GPU = neon
180-
HAVE_NEON = 1
181179
DYNAREC = ari64
182180
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
183181
CFLAGS += -march=armv8-a+crc -mcpu=cortex-a53 -mtune=cortex-a53
@@ -229,11 +227,9 @@ endif
229227
ifeq ($(platform),ios-arm64)
230228
ARCH := arm64
231229
BUILTIN_GPU = neon
232-
HAVE_NEON = 1
233230
DYNAREC = 0
234231
else
235232
ARCH := arm
236-
HAVE_NEON = 1
237233
HAVE_NEON_ASM = 1
238234
BUILTIN_GPU = neon
239235
CFLAGS += -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
@@ -266,7 +262,6 @@ endif
266262
CFLAGS += -DIOS -DTVOS
267263
ARCH := arm64
268264
BUILTIN_GPU = neon
269-
HAVE_NEON = 1
270265
DYNAREC = 0
271266
HAVE_PHYSICAL_CDROM = 0
272267
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
@@ -293,7 +288,6 @@ else ifeq ($(platform), libnx)
293288
WANT_ZLIB = 0
294289
PARTIAL_LINKING = 1
295290
BUILTIN_GPU = neon
296-
HAVE_NEON = 1
297291
DYNAREC = ari64
298292
HAVE_PHYSICAL_CDROM = 0
299293

@@ -302,7 +296,6 @@ else ifeq ($(platform), arm64)
302296
TARGET := $(TARGET_NAME)_libretro.so
303297
ARCH := arm64
304298
BUILTIN_GPU = neon
305-
HAVE_NEON = 1
306299
DYNAREC = ari64
307300
HAVE_PHYSICAL_CDROM = 0
308301
fpic := -fPIC
@@ -344,7 +337,6 @@ else ifeq ($(platform), vita)
344337
CFLAGS_LAST += -O3
345338
ASFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon
346339

347-
HAVE_NEON = 1
348340
HAVE_NEON_ASM = 1
349341
BUILTIN_GPU = neon
350342

@@ -386,7 +378,6 @@ else ifeq ($(platform), ctr)
386378
THREAD_RENDERING = 1
387379
DYNAREC = ari64
388380
ARCH = arm
389-
HAVE_NEON = 0
390381
PARTIAL_LINKING = 1
391382
WANT_ZLIB = 0
392383
NO_POSIX_MEMALIGN := 1
@@ -438,7 +429,6 @@ else ifneq (,$(filter $(platform),ngc wii wiiu))
438429
else ifeq ($(platform), qnx)
439430
TARGET := $(TARGET_NAME)_libretro_qnx.so
440431
fpic := -fPIC
441-
HAVE_NEON = 1
442432
HAVE_NEON_ASM = 1
443433
DYNAREC = ari64
444434
BUILTIN_GPU = neon
@@ -457,7 +447,6 @@ else ifeq ($(platform), rpi1)
457447
fpic := -fPIC
458448
CFLAGS += -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
459449
ASFLAGS += -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
460-
HAVE_NEON = 0
461450
ARCH = arm
462451
BUILTIN_GPU = unai
463452
DYNAREC = ari64
@@ -468,7 +457,6 @@ else ifeq ($(platform), rpi2)
468457
fpic := -fPIC
469458
CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
470459
ASFLAGS += -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
471-
HAVE_NEON = 1
472460
HAVE_NEON_ASM = 1
473461
ARCH = arm
474462
BUILTIN_GPU = neon
@@ -480,7 +468,6 @@ else ifeq ($(platform), rpi3)
480468
fpic := -fPIC
481469
CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
482470
ASFLAGS += -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
483-
HAVE_NEON = 1
484471
HAVE_NEON_ASM = 1
485472
ARCH = arm
486473
BUILTIN_GPU = neon
@@ -491,7 +478,6 @@ else ifeq ($(platform), rpi3_64)
491478
TARGET := $(TARGET_NAME)_libretro.so
492479
ARCH := arm64
493480
BUILTIN_GPU = neon
494-
HAVE_NEON = 1
495481
DYNAREC = ari64
496482
fpic := -fPIC
497483
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a53 -ftree-vectorize
@@ -502,7 +488,6 @@ else ifeq ($(platform), rpi4)
502488
fpic := -fPIC
503489
CFLAGS += -marm -mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard
504490
ASFLAGS += -mcpu=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard
505-
HAVE_NEON = 1
506491
HAVE_NEON_ASM = 1
507492
ARCH = arm
508493
BUILTIN_GPU = neon
@@ -513,7 +498,6 @@ else ifeq ($(platform), rpi4_64)
513498
TARGET := $(TARGET_NAME)_libretro.so
514499
ARCH := arm64
515500
BUILTIN_GPU = neon
516-
HAVE_NEON = 1
517501
DYNAREC = ari64
518502
fpic := -fPIC
519503
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
@@ -537,7 +521,6 @@ else ifeq ($(platform), classic_armv7_a7)
537521
CXXFLAGS += $(CFLAGS)
538522
CPPFLAGS += $(CFLAGS)
539523
ASFLAGS += $(CFLAGS)
540-
HAVE_NEON = 1
541524
HAVE_NEON_ASM = 1
542525
ARCH = arm
543526
BUILTIN_GPU = neon
@@ -561,7 +544,6 @@ else ifeq ($(platform), classic_armv8_a35)
561544
-fmerge-all-constants -fno-math-errno \
562545
-fno-stack-protector -fomit-frame-pointer \
563546
-marm -mcpu=cortex-a35 -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
564-
HAVE_NEON = 1
565547
HAVE_NEON_ASM = 1
566548
ARCH = arm
567549
BUILTIN_GPU = neon
@@ -574,7 +556,6 @@ else ifeq ($(platform), classic_armv8_a35)
574556
else ifneq (,$(findstring armv,$(platform)))
575557
TARGET := $(TARGET_NAME)_libretro.so
576558
fpic := -fPIC
577-
HAVE_NEON = 0
578559
BUILTIN_GPU = peops
579560
ifneq (,$(findstring cortexa8,$(platform)))
580561
CFLAGS += -mcpu=cortex-a8
@@ -591,7 +572,6 @@ else ifneq (,$(findstring armv,$(platform)))
591572
ifneq (,$(findstring neon,$(platform)))
592573
CFLAGS += -mfpu=neon
593574
ASFLAGS += -mfpu=neon
594-
HAVE_NEON = 1
595575
HAVE_NEON_ASM = 1
596576
BUILTIN_GPU = neon
597577
endif
@@ -613,7 +593,6 @@ else ifeq ($(platform), miyoo)
613593
ARCH = arm
614594
BUILTIN_GPU = unai
615595
DYNAREC = ari64
616-
HAVE_NEON = 0
617596

618597
# Emscripten
619598
else ifeq ($(platform), emscripten)
@@ -711,6 +690,9 @@ $(info platform: $(platform))
711690
$(info ARCH: $(ARCH))
712691
$(info DYNAREC: $(DYNAREC))
713692
$(info BUILTIN_GPU: $(BUILTIN_GPU))
693+
ifeq ($(ARCH),arm)
694+
$(info NEON_ASM: $(if $(HAVE_NEON_ASM),$(HAVE_NEON_ASM),no))
695+
endif
714696
$(info CC: $(CC) : $(shell $(CC) --version | head -1))
715697
$(info CFLAGS: $(CFLAGS))
716698
$(info MAIN_LDLIBS: $(MAIN_LDLIBS))

configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,6 @@ echo "PLUGINS = $plugins" >> $config_mak
654654
if [ "$have_neon_gpu" = "yes" ]; then
655655
echo "HAVE_NEON_GPU = 1" >> $config_mak
656656
fi
657-
if [ "$have_arm_neon" = "yes" ]; then
658-
echo "HAVE_NEON = 1" >> $config_mak
659-
fi
660657
if [ "$have_arm_neon_asm" = "yes" ]; then
661658
echo "HAVE_NEON_ASM = 1" >> $config_mak
662659
fi

0 commit comments

Comments
 (0)