From 1d478d12a987f258863d0c13c3865d362d7595f3 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Mon, 5 Jun 2023 09:58:34 +0900 Subject: [PATCH 1/3] update mcl --- mcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcl b/mcl index e51594e..de48456 160000 --- a/mcl +++ b/mcl @@ -1 +1 @@ -Subproject commit e51594e056dd2440c9bb3e95a97e790adcc3f1c9 +Subproject commit de484569a70fd300940692fce4c42c6f777af414 From c5e36dcda088178f9ad575c1e6b9db5575a51e7a Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Mon, 5 Jun 2023 09:58:57 +0900 Subject: [PATCH 2/3] [mac] add target flags --- Makefile | 1 + Makefile.onelib | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 659178a..968f82f 100644 --- a/Makefile +++ b/Makefile @@ -225,6 +225,7 @@ minimized_static_test: $(EXE_DIR)/minimized_static_test.exe clean: + make -C $(MCL_DIR) clean $(RM) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LLVM_SRC) $(BLS256_LIB) $(BLS256_SLIB) $(BLS384_LIB) $(BLS384_SLIB) $(BLS384_256_LIB) $(BLS384_256_SLIB) $(BLS512_LIB) $(BLS512_SLIB) ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC) diff --git a/Makefile.onelib b/Makefile.onelib index ac3f708..8a5fd2a 100644 --- a/Makefile.onelib +++ b/Makefile.onelib @@ -58,9 +58,14 @@ ifeq ($(CPU),systemz) _ARCH=s390x endif -ifneq ($(TARGET),) - MIN_CFLAGS+=-target $(TARGET) - ASFLAGS+=-target $(TARGET) +ifeq ($(UNAME_S),Darwin) +ifeq ($(CLANG_TARGET),) +CLANG_TARGET?=$(ARCH)-apple-macos +endif +endif +ifneq ($(CLANG_TARGET),) + MIN_CFLAGS+=-target $(CLANG_TARGET) + ASFLAGS+=-target $(CLANG_TARGET) endif OBJS+=$(BINT_OBJ) ifeq ($(findstring $(OS),mingw64/cygwin),) @@ -172,10 +177,10 @@ endif # cross compile # e.g. make -f Makefile.onelib CXX=clang++ AS=clang++ build_aarch64 LLVM_VER=-12 build_aarch64: - $(MAKE) -f $(THIS_FILE) ARCH=aarch64 TARGET=aarch64 + $(MAKE) -f $(THIS_FILE) ARCH=aarch64 CLANG_TARGET=aarch64 # $(CXX) -target aarch64 test/bls_c384_256_test.cpp -I ./include -I mcl/include bls/lib/linux/arm64/libbls384_256.a build_i686: - $(MAKE) -f $(THIS_FILE) ARCH=x86 TARGET=i686 + $(MAKE) -f $(THIS_FILE) ARCH=x86 CLANG_TARGET=i686 # g++ -m32 test/bls_c384_256_test.cpp -I ./include -I mcl/include bls/lib/linux/libbls384_256.a clean: From c62fc4efc1bc5095782f1b6a0f556c1a48cf0315 Mon Sep 17 00:00:00 2001 From: MITSUNARI Shigeo Date: Tue, 6 Jun 2023 20:08:43 +0900 Subject: [PATCH 3/3] update mcl --- mcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcl b/mcl index de48456..f37c450 160000 --- a/mcl +++ b/mcl @@ -1 +1 @@ -Subproject commit de484569a70fd300940692fce4c42c6f777af414 +Subproject commit f37c450335d597e16ffacef47e24bc3f6bfeee1b