diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2016-05-25 15:19:29 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2016-05-25 15:19:29 +0800 |
| commit | cbbb7b40f67ad51dd5f540b6f1976f26634dfc6e (patch) | |
| tree | d20590ec297fa2ce6558febb7f7bc0f40d071615 | |
| parent | c13639f5f156eb48319a981f466d286b8f6ad8ff (diff) | |
| download | dexon-mcl-cbbb7b40f67ad51dd5f540b6f1976f26634dfc6e.tar.gz dexon-mcl-cbbb7b40f67ad51dd5f540b6f1976f26634dfc6e.tar.zst dexon-mcl-cbbb7b40f67ad51dd5f540b6f1976f26634dfc6e.zip | |
add -relocation-model=pic for llvm-llc
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | java/Makefile | 9 |
2 files changed, 7 insertions, 4 deletions
@@ -24,7 +24,7 @@ FUNC_LL=src/generated.ll # CPU is used for llvm # see $(LLVM_LLC) --version -LLVM_FLAGS=-march=$(CPU) +LLVM_FLAGS=-march=$(CPU) -relocation-model=pic HAS_BMI2=$(shell cat "/proc/cpuinfo" | grep bmi2 >/dev/null && echo "1") ifeq ($(HAS_BMI2),1) diff --git a/java/Makefile b/java/Makefile index 00f61b7..6203764 100644 --- a/java/Makefile +++ b/java/Makefile @@ -10,7 +10,7 @@ else LDFLAGS+=-lrt endif CFLAGS+= -shared $(JAVA_INC) -I ../include -I ../../xbyak -I ../../cybozulib/include -Wno-strict-aliasing -LDFLAGS+=../lib/libmcl.a +MCL_LIB=../lib/libmcl.a PACKAGE_NAME=com.herumi.mcl PACKAGE_DIR=$(subst .,/,$(PACKAGE_NAME)) @@ -23,8 +23,11 @@ mcl_if_wrap.cxx: mcl_if.i mcl_if.hpp $(MKDIR) $(PACKAGE_DIR) swig -java -package $(PACKAGE_NAME) -outdir $(PACKAGE_DIR) -c++ -Wall mcl_if.i -$(TARGET): mcl_if_wrap.cxx - $(PRE)$(CXX) $< -o $@ $(CFLAGS) $(LDFLAGS) +$(MCL_LIB): + make -C .. + +$(TARGET): mcl_if_wrap.cxx $(MCL_LIB) + $(PRE)$(CXX) $< -o $@ $(CFLAGS) $(LDFLAGS) $(MCL_LIB) %.class: %.java |