[Makefile] Move ARM CFLAGS before compilation (#2536)

diff --git a/Makefile b/Makefile
index e0528aeee24c02b1d492e703ed12dc64e123a37a..897c5cb9abccabc791b05fb05dd6d312a7542473 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,28 @@ ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686 amd64))
        #CXXFLAGS += -mssse3
 endif
 
+ifneq ($(filter aarch64%,$(UNAME_M)),)
+       # Apple M1, M2, etc.
+       # Raspberry Pi 3, 4, Zero 2 (64-bit)
+       CFLAGS   += -mcpu=native
+       CXXFLAGS += -mcpu=native
+endif
+
+ifneq ($(filter armv6%,$(UNAME_M)),)
+       # Raspberry Pi 1, Zero
+       CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access
+endif
+
+ifneq ($(filter armv7%,$(UNAME_M)),)
+       # Raspberry Pi 2
+       CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access -funsafe-math-optimizations
+endif
+
+ifneq ($(filter armv8%,$(UNAME_M)),)
+       # Raspberry Pi 3, 4, Zero 2 (32-bit)
+       CFLAGS += -mfp16-format=ieee -mno-unaligned-access
+endif
+
 ifneq ($(filter ppc64%,$(UNAME_M)),)
        POWER9_M := $(shell grep "POWER9" /proc/cpuinfo)
        ifneq (,$(findstring POWER9,$(POWER9_M)))
@@ -270,28 +292,6 @@ ifdef LLAMA_METAL
        OBJS     += ggml-metal.o
 endif # LLAMA_METAL
 
-ifneq ($(filter aarch64%,$(UNAME_M)),)
-       # Apple M1, M2, etc.
-       # Raspberry Pi 3, 4, Zero 2 (64-bit)
-       CFLAGS   += -mcpu=native
-       CXXFLAGS += -mcpu=native
-endif
-
-ifneq ($(filter armv6%,$(UNAME_M)),)
-       # Raspberry Pi 1, Zero
-       CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access
-endif
-
-ifneq ($(filter armv7%,$(UNAME_M)),)
-       # Raspberry Pi 2
-       CFLAGS += -mfpu=neon-fp-armv8 -mfp16-format=ieee -mno-unaligned-access -funsafe-math-optimizations
-endif
-
-ifneq ($(filter armv8%,$(UNAME_M)),)
-       # Raspberry Pi 3, 4, Zero 2 (32-bit)
-       CFLAGS += -mfp16-format=ieee -mno-unaligned-access
-endif
-
 ifdef LLAMA_METAL
 ggml-metal.o: ggml-metal.m ggml-metal.h
        $(CC) $(CFLAGS) -c $< -o $@