diff options
| author | John Högberg <john@erlang.org> | 2022-01-18 16:13:09 +0100 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2022-01-19 12:46:47 +0100 |
| commit | daf98d0720c574d2a37111c1afb768183d7c1552 (patch) | |
| tree | 353d4314657b16740e80fca448005e173f9ac9f0 /erts/emulator/Makefile.in | |
| parent | 12b25f821a885877188980f44935ec948cd5b434 (diff) | |
| parent | 055e21851725e51c691cfb5654e5a8a58dc30386 (diff) | |
| download | erlang-daf98d0720c574d2a37111c1afb768183d7c1552.tar.gz | |
Merge branch 'john/jit/update-asmjit-maint' into john/jit/update-asmjit-master
* john/jit/update-asmjit-maint:
jit: Update asmjit version
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 72018c0b81..6e3afa3648 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -925,36 +925,29 @@ $(OBJDIR)/%.o: nifs/$(ERLANG_OSTYPE)/%.c # ASMJIT_FLAGS=-DASMJIT_EMBED=1 -DASMJIT_NO_BUILDER=1 -DASMJIT_NO_DEPRECATED=1 -DASMJIT_STATIC=1 -DASMJIT_NO_FOREIGN=1 -ifeq ($(JIT_ARCH), arm) -# Work around a bug in the current beta release causing a linking -# error. -ASMJIT_FLAGS+=-DASMJIT_NO_VALIDATION -endif - ASMJIT_PCH_OBJ=$(TTF_DIR)/asmjit/asmjit.hpp.gch ASMJIT_PCH_SRC=$(TTF_DIR)/asmjit/asmjit.hpp $(OBJDIR)/%.o: beam/jit/%.cpp $(ASMJIT_PCH_OBJ) - $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ + $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ $(subst -O2, $(GEN_OPT_FLGS), $(CXXFLAGS)) \ -include $(ASMJIT_PCH_SRC) -c $< -o $@ -$(OBJDIR)/%.o: beam/jit/$(JIT_ARCH)/%.cpp beam/jit/$(JIT_ARCH)/beam_asm.hpp \ - $(ASMJIT_PCH_OBJ) - $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ +$(OBJDIR)/%.o: beam/jit/$(JIT_ARCH)/%.cpp beam/jit/$(JIT_ARCH)/beam_asm.hpp $(ASMJIT_PCH_OBJ) + $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ $(subst -O2, $(GEN_OPT_FLGS), $(CXXFLAGS)) \ -include $(ASMJIT_PCH_SRC) -c $< -o $@ $(OBJDIR)/asmjit/%.o: asmjit/%.cpp $(ASMJIT_PCH_OBJ) $(dir $@) - $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ + $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ $(subst -O2, $(GEN_OPT_FLGS), $(CXXFLAGS)) \ -include $(ASMJIT_PCH_SRC) -c $< -o $@ ## The dependency on erl_bif_info.c is in order to trigger a rebuild when ## the git sha define on the command line argument changes $(ASMJIT_PCH_OBJ): $(ASMJIT_PCH_SRC) $(ASMJIT_TTF_H) beam/erl_bif_info.c - $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ - $(subst -O2, $(GEN_OPT_FLGS), $(CXXFLAGS)) \ + $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ + $(subst -O2, $(GEN_OPT_FLGS), $(CXXFLAGS)) \ -I$(TTF_DIR) -c $< -o $@ ## We copy all asmjit headers into TTF_DIR in order for cross-compilation |