Merge branch 'dev'

herumi · Sep 2, 2024 · 0c05ea1 · 0c05ea1
2 parents f6d1a1b + 8fe3c0f
commit 0c05ea1
Show file tree

Hide file tree

Showing 5 changed files with 259 additions and 252 deletions.
diff --git a/Makefile b/Makefile
@@ -188,10 +188,14 @@ src/bint32.ll: src/gen_bint.exe
 	$< -u 32 -ver 0x90 > $@
 endif
 ifeq ($(ARCH),x86_64)
-  MSM=msm_avx
-  MCL_MSM?=1
+  ifneq ($(UNAME_S),Darwin)
+    MCL_MSM?=1
+  endif
 endif
 ifeq ($(MCL_MSM),1)
+  ifeq ($(ARCH),x86_64)
+    MSM=msm_avx
+  endif
   CFLAGS+=-DMCL_MSM=1
   LIB_OBJ+=$(OBJ_DIR)/$(MSM).o
 $(OBJ_DIR)/$(MSM).o: src/$(MSM).cpp src/$(MSM)_bls12_381.h src/avx512.hpp
@@ -491,6 +495,9 @@ clean_standalone:
 update_xbyak:
 	cp -a ../xbyak/xbyak/xbyak.h ../xbyak/xbyak/xbyak_util.h ../xbyak/xbyak/xbyak_mnemonic.h src/xbyak/
 
+update_s_xbyak:
+	cp -a ../s_xbyak/s_xbyak.py src/
+
 update_cybozulib:
 	cp -a $(addprefix ../cybozulib/,$(wildcard include/cybozu/*.hpp)) include/cybozu/
 

diff --git a/include/mcl/op.hpp b/include/mcl/op.hpp
@@ -29,7 +29,7 @@
 
 namespace mcl {
 
-static const int version = 0x198; /* 0xABC = A.BC */
+static const int version = 0x199; /* 0xABC = A.BC */
 
 /*
 	specifies available string format mode for X::setIoMode()