From a1fa3ee27d0130f0a7e1414c016256206bb54520 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 26 Oct 2021 17:12:43 +0100 Subject: [PATCH] Fix logic in previous commit, keep __builtin_ia32_pause ARM compat --- include/neon-compat/pmmintrin.h | 2 +- plugins/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/neon-compat/pmmintrin.h b/include/neon-compat/pmmintrin.h index b21efb9..7d1091c 100644 --- a/include/neon-compat/pmmintrin.h +++ b/include/neon-compat/pmmintrin.h @@ -25,7 +25,7 @@ static inline void __builtin_ia32_pause() { - // __asm__ __volatile__("isb\n"); + __asm__ __volatile__("isb\n"); } static inline diff --git a/plugins/Makefile b/plugins/Makefile index c066e10..e3fb4e2 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -27,7 +27,7 @@ PLUGIN_FILES = plugins.cpp PLUGIN_FILES += $(wildcard Cardinal/src/*.cpp) -ifeq ($(NOPLUGINS),true) +ifneq ($(NOPLUGINS),true) # -------------------------------------------------------------- # AmalgamatedHarmonics @@ -244,7 +244,7 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa # -------------------------------------------------------------- -endif # NOPLUGINS +endif # !NOPLUGINS # -------------------------------------------------------------- # Build setup