Merge from upstream

cephes.asd

@@ -7,7 +7,9 @@
 (defmethod perform ((o compile-op) (c makefile))
   (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes/"))
          (lib (make-pathname :directory (pathname-directory lib-dir)
-                             :name "libmd"
+                             :name #+(or (and unix (not darwin)) windows win32) "libmd"
+			           #+(and darwin arm64) "libmd-arm64"
+			           #+(and darwin x86-64) "libmd-x86-64"
 			     :device (pathname-device lib-dir)
                              :type #+darwin "dylib"
 				   #+(and unix (not darwin)) "so"

init.lisp

@@ -6,7 +6,8 @@
   (:windows (:or "libmd"
 		 #.(merge-pathnames "scipy-cephes/libmd.dll" *compile-file-pathname*)))
   (:darwin (:or "libmd"
-              #.(merge-pathnames "scipy-cephes/libmd.dylib" *compile-file-pathname*)))
+		#+x86-64 #.(merge-pathnames "scipy-cephes/libmd-x86-64.dylib" *compile-file-pathname*)
+		#+arm64 #.(merge-pathnames "scipy-cephes/libmd-arm64.dylib" *compile-file-pathname*)))
   (:unix (:or "libmd"
               #.(merge-pathnames "scipy-cephes/libmd.so" *compile-file-pathname*)))
   (t (:default "libmd")))

scipy-cephes/Makefile

@@ -15,13 +15,18 @@ ifeq ($(OS),Windows_NT)
 	OUTPUT = libmd.dll
 else # UNIX, use uname to determine which one
 	UNAME_S := $(shell uname -s)
+	UNAME_M := $(shell uname -m)
 	ifeq ($(UNAME_S), Linux)
 		LDFLAGS = -lm
 		OUTPUT = libmd.so
 	endif
 	ifeq ($(UNAME_S), Darwin)
 		LDFLAGS = -lm
-		OUTPUT = libmd.dylib
+		ifeq ($(UNAME_M), arm64)
+			OUTPUT = libmd-arm64.dylib
+		else
+			OUTPUT = libmd-x86-64.dylib
+		endif
 	endif
 endif
 
@@ -115,6 +120,7 @@ clean:
 	rm -f libmd.a
 	rm -f libmd.dll
 	rm -f libmd.so
+	rm -f libmd-*.dylib
 	rm -f time-it
 	rm -f dtestvec