xiaoxiang781216 commented on code in PR #1658: URL: https://github.com/apache/nuttx-apps/pull/1658#discussion_r1134367551
########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) + +ALL_T= $(MINILUA_BIN) $(MINILUA_BIN) +ALL_HDRGEN= $(LUAJIT_UNPACK)/src/lj_bcdef.h $(LUAJIT_UNPACK)/src/lj_ffdef.h $(LUAJIT_UNPACK)/src/lj_libdef.h $(LUAJIT_UNPACK)/src/lj_recdef.h $(LUAJIT_UNPACK)/src/lj_folddef.h +ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) + +HOST_OBJS = $(MINILUA_O) $(BUILDVM_O) + +LJLIB_O= $(LUAJIT_UNPACK)/src/lib_base.o $(LUAJIT_UNPACK)/src/lib_math.o $(LUAJIT_UNPACK)/src/lib_bit.o $(LUAJIT_UNPACK)/src/lib_string.o $(LUAJIT_UNPACK)/src/lib_table.o $(LUAJIT_UNPACK)/src/lib_io.o $(LUAJIT_UNPACK)/src/lib_os.o $(LUAJIT_UNPACK)/src/lib_package.o $(LUAJIT_UNPACK)/src/lib_debug.o $(LUAJIT_UNPACK)/src/lib_jit.o $(LUAJIT_UNPACK)/src/lib_ffi.o $(LUAJIT_UNPACK)/src/lib_buffer.o + +LJLIB_C= $(LJLIB_O:.o=.c) + +.NOTPARALLEL: + +$(MINILUA_BIN): $(MINILUA_O) + @echo "HOSTLINK $@" + $(Q) $(HOSTCC) -m32 -o $@ $(MINILUA_O) $(HOSTLDFLAGS) + +$(LUAJIT_UNPACK)/src/host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_BIN) $(LUAJIT_UNPACK)/src/lj_arch.h $(LUAJIT_UNPACK)/src/lua.h $(LUAJIT_UNPACK)/src/luaconf.h + @echo "DYNASM $@" + $(Q)$(MINILUA_BIN) $(LUAJIT_UNPACK)/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(DASM_DASC) + +$(BUILDVM_BIN): $(BUILDVM_O) + @echo "HOSTLINK $@" + $(Q)$(HOSTCC) -m32 -o $@ $(BUILDVM_O) + +$(LJVM_S): $(BUILDVM_BIN) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m elfasm -o $@ + +$(LUAJIT_UNPACK)/src/lj_bcdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m bcdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_ffdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m ffdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_libdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m libdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_recdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m recdef -o $@ $(LJLIB_C) + +$(LIB_VMDEF): $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m vmdef -o $(LIB_VMDEFP) $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_folddef.h: $(BUILDVM_BIN) $(LUAJIT_UNPACK)/src/lj_opt_fold.c + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m folddef -o $@ $(LUAJIT_UNPACK)/src/lj_opt_fold.c Review Comment: let's use $(ECHO_BEGIN) and $(ECHO_END) from https://github.com/apache/nuttx/pull/8378 for all host rules ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c Review Comment: can we sort file name to help verify with the package ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" Review Comment: ```suggestion CFLAGS += -DLUA_ROOT=CONFIG_LIBC_HOMEDIR ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) Review Comment: ```suggestion LIB_VMDEFP = $(LIB_VMDEF) ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S Review Comment: ```suggestion LJVM_S = $(LUAJIT_UNPACK)/src/lj_vm.S ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) + +ALL_T= $(MINILUA_BIN) $(MINILUA_BIN) +ALL_HDRGEN= $(LUAJIT_UNPACK)/src/lj_bcdef.h $(LUAJIT_UNPACK)/src/lj_ffdef.h $(LUAJIT_UNPACK)/src/lj_libdef.h $(LUAJIT_UNPACK)/src/lj_recdef.h $(LUAJIT_UNPACK)/src/lj_folddef.h Review Comment: add space before = ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,172 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(Q) echo "Downloading $(LUAJIT_TARBALL)" + $(Q) curl -O -L $(LUAJIT_URL) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS= +DASM_FLAGS+= -D ENDIAN_LE +DASM_FLAGS+= -D JIT +DASM_FLAGS+= -D FFI +DASM_FLAGS+= -D DUALNUM +DASM_FLAGS+= -D FPU +DASM_FLAGS+= -D HFABI +DASM_FLAGS+= -D NO_UNWIND +DASM_FLAGS+= -D VER=70 +DASM_ARCH= armv7m + +MINILUA_O= $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O= $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND Review Comment: let's sort the argument ```suggestion HOSTCFLAGS += -DLJ_ABI_SOFTFP=0 -DLJ_ARCH_HASFPU=1 -DLUAJIT_DISABLE_PROFILE -DLUAJIT_NO_UNWIND -DLUAJIT_TARGET=LUAJIT_ARCH_arm -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) + +ALL_T= $(MINILUA_BIN) $(MINILUA_BIN) +ALL_HDRGEN= $(LUAJIT_UNPACK)/src/lj_bcdef.h $(LUAJIT_UNPACK)/src/lj_ffdef.h $(LUAJIT_UNPACK)/src/lj_libdef.h $(LUAJIT_UNPACK)/src/lj_recdef.h $(LUAJIT_UNPACK)/src/lj_folddef.h +ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) + +HOST_OBJS = $(MINILUA_O) $(BUILDVM_O) + +LJLIB_O= $(LUAJIT_UNPACK)/src/lib_base.o $(LUAJIT_UNPACK)/src/lib_math.o $(LUAJIT_UNPACK)/src/lib_bit.o $(LUAJIT_UNPACK)/src/lib_string.o $(LUAJIT_UNPACK)/src/lib_table.o $(LUAJIT_UNPACK)/src/lib_io.o $(LUAJIT_UNPACK)/src/lib_os.o $(LUAJIT_UNPACK)/src/lib_package.o $(LUAJIT_UNPACK)/src/lib_debug.o $(LUAJIT_UNPACK)/src/lib_jit.o $(LUAJIT_UNPACK)/src/lib_ffi.o $(LUAJIT_UNPACK)/src/lib_buffer.o + +LJLIB_C= $(LJLIB_O:.o=.c) + +.NOTPARALLEL: + +$(MINILUA_BIN): $(MINILUA_O) + @echo "HOSTLINK $@" + $(Q) $(HOSTCC) -m32 -o $@ $(MINILUA_O) $(HOSTLDFLAGS) + +$(LUAJIT_UNPACK)/src/host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_BIN) $(LUAJIT_UNPACK)/src/lj_arch.h $(LUAJIT_UNPACK)/src/lua.h $(LUAJIT_UNPACK)/src/luaconf.h + @echo "DYNASM $@" + $(Q)$(MINILUA_BIN) $(LUAJIT_UNPACK)/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(DASM_DASC) + +$(BUILDVM_BIN): $(BUILDVM_O) + @echo "HOSTLINK $@" + $(Q)$(HOSTCC) -m32 -o $@ $(BUILDVM_O) + +$(LJVM_S): $(BUILDVM_BIN) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m elfasm -o $@ + +$(LUAJIT_UNPACK)/src/lj_bcdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m bcdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_ffdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m ffdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_libdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m libdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_recdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m recdef -o $@ $(LJLIB_C) + +$(LIB_VMDEF): $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" Review Comment: ```suggestion @echo "BUILDVM $@" ``` remove all extra space before $@ ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ Review Comment: ```suggestion BUILDVM_O += $(LUAJIT_UNPACK)/src/host/buildvm.o BUILDVM_O += $(LUAJIT_UNPACK)/src/host/buildvm_asm.o ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) + +ALL_T= $(MINILUA_BIN) $(MINILUA_BIN) +ALL_HDRGEN= $(LUAJIT_UNPACK)/src/lj_bcdef.h $(LUAJIT_UNPACK)/src/lj_ffdef.h $(LUAJIT_UNPACK)/src/lj_libdef.h $(LUAJIT_UNPACK)/src/lj_recdef.h $(LUAJIT_UNPACK)/src/lj_folddef.h +ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) + +HOST_OBJS = $(MINILUA_O) $(BUILDVM_O) + +LJLIB_O= $(LUAJIT_UNPACK)/src/lib_base.o $(LUAJIT_UNPACK)/src/lib_math.o $(LUAJIT_UNPACK)/src/lib_bit.o $(LUAJIT_UNPACK)/src/lib_string.o $(LUAJIT_UNPACK)/src/lib_table.o $(LUAJIT_UNPACK)/src/lib_io.o $(LUAJIT_UNPACK)/src/lib_os.o $(LUAJIT_UNPACK)/src/lib_package.o $(LUAJIT_UNPACK)/src/lib_debug.o $(LUAJIT_UNPACK)/src/lib_jit.o $(LUAJIT_UNPACK)/src/lib_ffi.o $(LUAJIT_UNPACK)/src/lib_buffer.o + +LJLIB_C= $(LJLIB_O:.o=.c) + +.NOTPARALLEL: + +$(MINILUA_BIN): $(MINILUA_O) + @echo "HOSTLINK $@" + $(Q) $(HOSTCC) -m32 -o $@ $(MINILUA_O) $(HOSTLDFLAGS) + +$(LUAJIT_UNPACK)/src/host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_BIN) $(LUAJIT_UNPACK)/src/lj_arch.h $(LUAJIT_UNPACK)/src/lua.h $(LUAJIT_UNPACK)/src/luaconf.h + @echo "DYNASM $@" + $(Q)$(MINILUA_BIN) $(LUAJIT_UNPACK)/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(DASM_DASC) + +$(BUILDVM_BIN): $(BUILDVM_O) + @echo "HOSTLINK $@" + $(Q)$(HOSTCC) -m32 -o $@ $(BUILDVM_O) + +$(LJVM_S): $(BUILDVM_BIN) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m elfasm -o $@ + +$(LUAJIT_UNPACK)/src/lj_bcdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m bcdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_ffdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m ffdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_libdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m libdef -o $@ $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_recdef.h: $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m recdef -o $@ $(LJLIB_C) + +$(LIB_VMDEF): $(BUILDVM_BIN) $(LJLIB_C) + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m vmdef -o $(LIB_VMDEFP) $(LJLIB_C) + +$(LUAJIT_UNPACK)/src/lj_folddef.h: $(BUILDVM_BIN) $(LUAJIT_UNPACK)/src/lj_opt_fold.c + @echo "BUILDVM $@" + $(Q)$(BUILDVM_BIN) -m folddef -o $@ $(LUAJIT_UNPACK)/src/lj_opt_fold.c + +$(HOST_OBJS): %.o: %.c + @echo "CC: $<" + $(Q) $(HOSTCC) -m32 -c $(HOSTCFLAGS) $< -o $@ Review Comment: remove -m32? ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc Review Comment: ```suggestion DASM_DASC = $(LUAJIT_UNPACK)/src/vm_armv7m.dasc ``` ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua +LIB_VMDEFP= $(LIB_VMDEF) + +ALL_T= $(MINILUA_BIN) $(MINILUA_BIN) +ALL_HDRGEN= $(LUAJIT_UNPACK)/src/lj_bcdef.h $(LUAJIT_UNPACK)/src/lj_ffdef.h $(LUAJIT_UNPACK)/src/lj_libdef.h $(LUAJIT_UNPACK)/src/lj_recdef.h $(LUAJIT_UNPACK)/src/lj_folddef.h +ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) + +HOST_OBJS = $(MINILUA_O) $(BUILDVM_O) + +LJLIB_O= $(LUAJIT_UNPACK)/src/lib_base.o $(LUAJIT_UNPACK)/src/lib_math.o $(LUAJIT_UNPACK)/src/lib_bit.o $(LUAJIT_UNPACK)/src/lib_string.o $(LUAJIT_UNPACK)/src/lib_table.o $(LUAJIT_UNPACK)/src/lib_io.o $(LUAJIT_UNPACK)/src/lib_os.o $(LUAJIT_UNPACK)/src/lib_package.o $(LUAJIT_UNPACK)/src/lib_debug.o $(LUAJIT_UNPACK)/src/lib_jit.o $(LUAJIT_UNPACK)/src/lib_ffi.o $(LUAJIT_UNPACK)/src/lib_buffer.o Review Comment: ```suggestion LJLIB_O += $(LUAJIT_UNPACK)/src/lib_base.o LJLIB_O += $(LUAJIT_UNPACK)/src/lib_math.o ``` ``` and sort by file name ########## interpreters/luajit/Makefile: ########## @@ -0,0 +1,170 @@ +############################################################################ +# apps/interpreters/luajit/Makefile +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +LUAJIT_PATCHS ?= $(sort $(wildcard 000*.patch)) + +LUAJIT_VERSION := $(patsubst "%",%,$(CONFIG_LUAJIT_VERSION)) +LUAJIT_UNPACK = LuaJIT +LUAJIT_TARBALL = $(LUAJIT_VERSION).tar.gz +LUAJIT_URL_BASE = https://github.com/LuaJIT/LuaJIT/archive +LUAJIT_URL = $(LUAJIT_URL_BASE)/$(LUAJIT_TARBALL) + +MAINSRC = luajit.c + +CSRCS += lib_aux.c lib_base.c lib_bit.c lib_buffer.c lib_debug.c +CSRCS += lib_ffi.c lib_init.c lib_io.c lib_jit.c lib_math.c +CSRCS += lib_os.c lib_package.c lib_string.c lib_table.c +CSRCS += lj_alloc.c lj_api.c lj_asm.c lj_assert.c lj_bc.c +CSRCS += lj_bcread.c lj_bcwrite.c lj_buf.c lj_carith.c lj_ccall.c +CSRCS += lj_ccallback.c lj_cconv.c lj_cdata.c lj_char.c lj_clib.c +CSRCS += lj_cparse.c lj_crecord.c lj_ctype.c lj_debug.c lj_dispatch.c +CSRCS += lj_err.c lj_ffrecord.c lj_func.c lj_gc.c lj_gdbjit.c +CSRCS += lj_ir.c lj_lex.c lj_lib.c lj_load.c lj_mcode.c lj_meta.c +CSRCS += lj_obj.c lj_opt_dce.c lj_opt_fold.c lj_opt_loop.c +CSRCS += lj_opt_mem.c lj_opt_narrow.c lj_opt_sink.c lj_opt_split.c +CSRCS += lj_parse.c lj_prng.c lj_profile.c lj_record.c lj_serialize.c +CSRCS += lj_snap.c lj_state.c lj_str.c lj_strfmt.c lj_strfmt_num.c +CSRCS += lj_strscan.c lj_tab.c lj_trace.c lj_udata.c lj_vmevent.c +CSRCS += lj_vmmath.c + +ASRCS += lj_vm.S + +VPATH += $(LUAJIT_UNPACK)/dynasm +VPATH += $(LUAJIT_UNPACK)/src +VPATH += $(LUAJIT_UNPACK)/src/host +CFLAGS += -fomit-frame-pointer -fno-short-enums -DLUAJIT_OS=LUAJIT_OS_NUTTX +CFLAGS += -D__ARM_ARCH_7M__ -DLUAJIT_NO_UNWIND -DLUAJIT_DISABLE_PROFILE +CFLAGS += -DLUAJIT_SECURITY_PRNG=0 -DLUAJIT_SECURITY_MCODE=0 +CFLAGS += -DLUA_ROOT=\"/home\" + +PROGNAME = luajit +PRIORITY = $(CONFIG_LUAJIT_PRIORITY) +STACKSIZE = $(CONFIG_LUAJIT_STACKSIZE) +MODULE = $(CONFIG_INTERPRETERS_LUAJIT) + +$(LUAJIT_TARBALL): + $(call DOWNLOAD,$(LUAJIT_URL_BASE),$(LUAJIT_TARBALL),$(LUAJIT_TARBALL)) + +$(LUAJIT_UNPACK): $(LUAJIT_TARBALL) + $(Q) echo "Unpacking $(LUAJIT_TARBALL) to $(LUAJIT_UNPACK)" + $(Q) tar xzvf $(LUAJIT_TARBALL) + $(Q) mv LuaJIT-$(LUAJIT_VERSION) $(LUAJIT_UNPACK) + $(Q) cat $(LUAJIT_PATCHS) | \ + patch -s -N -d $(LUAJIT_UNPACK) -p1 + +$(LUAJIT_UNPACK)/.patch: $(LUAJIT_UNPACK) + $(Q) touch $(LUAJIT_UNPACK)/.patch + +DASM_DASC= $(LUAJIT_UNPACK)/src/vm_armv7m.dasc + +DASM_FLAGS += -D ENDIAN_LE +DASM_FLAGS += -D JIT +DASM_FLAGS += -D FFI +DASM_FLAGS += -D DUALNUM +DASM_FLAGS += -D FPU +DASM_FLAGS += -D HFABI +DASM_FLAGS += -D NO_UNWIND +DASM_FLAGS += -D VER=70 +DASM_ARCH = armv7m + +MINILUA_O = $(LUAJIT_UNPACK)/src/host/minilua.o + +BUILDVM_O = $(LUAJIT_UNPACK)/src/host/buildvm.o $(LUAJIT_UNPACK)/src/host/buildvm_asm.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_peobj.o $(LUAJIT_UNPACK)/src/host/buildvm_lib.o \ + $(LUAJIT_UNPACK)/src/host/buildvm_fold.o + +HOSTCFLAGS += -DLUAJIT_DISABLE_PROFILE -I$(LUAJIT_UNPACK)/src -I$(LUAJIT_UNPACK)/src/host -D__ARM_ARCH_7M__=1 -DLUAJIT_TARGET=LUAJIT_ARCH_arm -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -DLUAJIT_NO_UNWIND +HOSTLDFLAGS += -lm + +MINILUA_BIN = $(LUAJIT_UNPACK)/src/host/minilua +BUILDVM_BIN = $(LUAJIT_UNPACK)/src/host/buildvm + +LJVM_S= $(LUAJIT_UNPACK)/src/lj_vm.S + +LIB_VMDEF= $(LUAJIT_UNPACK)/src/jit/vmdef.lua Review Comment: ```suggestion LIB_VMDEF = $(LUAJIT_UNPACK)/src/jit/vmdef.lua ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
