From aceeb2cae1acb037d25bf733c2440186e6740cd6 Mon Sep 17 00:00:00 2001
From: zaikunzhang <zaikunzhang@gmail.com>
Date: Tue, 9 Apr 2024 18:37:31 +0800
Subject: [PATCH] 240409.183731.HKT revise .cirrus.yml for freebsd on arm64

---
 .cirrus.yml                             | 4 +---
 fortran/tests/makefiles/Makefile.common | 9 +++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a0ba765156..7a761cb181 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,14 +9,12 @@ task:
 
   matrix:
     - name: AMD64 FreeBSD
-      container:
       freebsd_instance:
         image_family: freebsd-14-0
 
     - name: ARM64 FreeBSD
       arm_container:
-      freebsd_instance:
-        image_family: freebsd-14-0
+        image: freebsd/aarch64:14.0
 
     - name: MacOS Silicon
       macos_instance:
diff --git a/fortran/tests/makefiles/Makefile.common b/fortran/tests/makefiles/Makefile.common
index 2323eba098..28d4f6f4ca 100644
--- a/fortran/tests/makefiles/Makefile.common
+++ b/fortran/tests/makefiles/Makefile.common
@@ -258,15 +258,16 @@ $(foreach TST, $(TESTS_INT_C_NO_QP), $(eval $(TST): SUBTESTS_C := \
 .PHONY: all test test_c clean $(TESTS) $(TESTS_C) $(TESTS_INT) $(TESTS_INT_C) source_* clean*
 
 # Operating system.
-OSTYPE :=
+OSTYPE := LINUX   # We assume the OS is LINUX by default.
 ifeq ($(OS),Windows_NT)
 	OSTYPE := WINDOWS
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
 		OSTYPE := MAC
-	else # We assume the OS is LINUX by default.
-		OSTYPE := LINUX
+	endif
+	ifeq ($(UNAME_S),FreeBSD)
+		OSTYPE := FREEBSD
 	endif
 endif
 
@@ -446,7 +447,7 @@ else
 	GFORT := $(GFORT) -fno-stack-arrays -fstack-check
 endif
 # -fsanitize=leak,address does not work with gdb.
-FSAN := #$(shell if [[ $$(($(GFORT) -dumpversion 2>/dev/null || echo 0) | sed 's|\..*||') -gt 9 && $(OSTYPE) != 'MAC' ]] ; then echo "-fsanitize=undefined"; else echo ""; fi)
+FSAN := $(shell if [[ $$(($(GFORT) -dumpversion 2>/dev/null || echo 0) | sed 's|\..*||') -gt 9 && $(OSTYPE) != 'MAC' && $(OSTYPE) != 'FREEBSD' ]] ; then echo "-fsanitize=undefined"; else echo ""; fi)
 GFORT := $(GFORT) $(GFSTD) -fall-intrinsics -frecursive \
 	-Wall -Wextra -Wpedantic -pedantic -Wampersand -Wconversion -Wuninitialized -Wmaybe-uninitialized \
 	-Wsurprising -Waliasing -Wimplicit-interface -Wimplicit-procedure -Wintrinsics-std -Wunderflow \