Skip to content

Commit

Permalink
remove outdated makefile comments targets
Browse files Browse the repository at this point in the history
  • Loading branch information
contrun committed Oct 25, 2023
1 parent 96edfa8 commit 2d056c4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ clean-local:
rm -f build/libckblua*
rm -f build/dylibtest
rm -f build/dylibexample
rm -f build/spawnexample
rm -f build/spawnexample*

clean: clean-local
make -C lualib clean
Expand Down
38 changes: 7 additions & 31 deletions Makefile.clang
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ ifeq ($(origin LLVM_VERSION),undefined)
LLVM_VERSION = 16
endif

LLVM_SURFFIX = $(if $(LLVM_VERSION),-$(LLVM_VERSION),)
CC := clang${LLVM_SURFFIX}
LD := ld.lld${LLVM_SURFFIX}
OBJCOPY := llvm-objcopy${LLVM_SURFFIX}
AR := llvm-ar${LLVM_SURFFIX}
RANLIB := llvm-ranlib${LLVM_SURFFIX}
LLVM_SUFFIX = $(if $(LLVM_VERSION),-$(LLVM_VERSION),)
CC := clang${LLVM_SUFFIX}
LD := ld.lld${LLVM_SUFFIX}
OBJCOPY := llvm-objcopy${LLVM_SUFFIX}
AR := llvm-ar${LLVM_SUFFIX}
RANLIB := llvm-ranlib${LLVM_SUFFIX}

CFLAGS := --target=riscv64 -march=rv64imc_zba_zbb_zbc_zbs
CFLAGS += -D__ISO_C_VISIBLE=1999 -DCKB_DECLARATION_ONLY -DCKB_MALLOC_DECLARATION_ONLY -DCKB_PRINTF_DECLARATION_ONLY -fPIC -g -O3
Expand All @@ -24,20 +24,8 @@ CFLAGS += -Wall -Werror -Wno-error=unused-command-line-argument -Wno-error=incom
LDFLAGS := -static --gc-sections
LDFLAGS += -Ldeps/compiler-rt-builtins-riscv/build -lcompiler-rt

DOCKER_USER := $(shell id -u):$(shell id -g)
DOCKER_EXTRA_FLAGS ?=
# docker pull nervos/ckb-riscv-gnu-toolchain:gnu-bionic-20191012
BUILDER_DOCKER := nervos/ckb-riscv-gnu-toolchain@sha256:aae8a3f79705f67d505d1f1d5ddc694a4fd537ed1c7e9622420a470d59ba2ec3
PORT ?= 9999

all: lualib/liblua.a build/lua-loader build/spawnexample

all-via-docker:
docker run --rm -v `pwd`:/code ${BUILDER_DOCKER} bash -c "cd /code && make"

docker-interactive:
docker run --user ${DOCKER_USER} --rm -it -v "${CURRENT_DIR}:/code" --workdir /code --entrypoint /bin/bash ${DOCKER_EXTRA_FLAGS} ${BUILDER_DOCKER}

deps/compiler-rt-builtins-riscv/build/libcompiler-rt.a:
cd deps/compiler-rt-builtins-riscv && $(MAKE) CC=$(CC) LD=$(LD) OBJCOPY=$(OBJCOPY) AR=$(AR) RANLIB=$(RANLIB)

Expand All @@ -59,20 +47,11 @@ build/spawnexample: build/spawnexample.o build/stdlib.o deps/compiler-rt-builtin
build/lua-loader.o: lua-loader/lua-loader.c
$(CC) -c $(CFLAGS) -o $@ $<

# We need the soft floating point number support from libgcc.
# Note when -nostdlib is specified, libgcc is not linked to the program automatically.
# Also note libgcc.a must be appended to the file list, simply -lgcc does not for some reason.
# It seems gcc does not search libgcc in the install path.
build/lua-loader: build/lua-loader.o build/stdlib.o lualib/liblua.a deps/compiler-rt-builtins-riscv/build/libcompiler-rt.a
$(LD) $(LDFLAGS) -o $@ $^
cp $@ $@.debug
$(OBJCOPY) --strip-debug --strip-all $@

build/libckblua.so: build/lua-loader.o lualib/liblua.a
$(LD) $(LDFLAGS) -Wl,--dynamic-list lua-loader/libckblua.syms -fpic -shared -o $@ $^ $(shell $(CC) --print-search-dirs | sed -n '/install:/p' | sed 's/install:\s*//g')libgcc.a
cp $@ $@.debug
$(OBJCOPY) --strip-debug --strip-all $@

fmt:
clang-format -style="{BasedOnStyle: google, IndentWidth: 4, SortIncludes: false}" -i lualib/*.c lualib/*.h lua-loader/*.h lua-loader/*.c include/*.c include/*.h tests/test_cases/*.c

Expand All @@ -83,13 +62,10 @@ clean-local:
rm -f build/libckblua*
rm -f build/dylibtest
rm -f build/dylibexample
rm -f build/spawnexample
rm -f build/spawnexample*

clean: clean-local
make -C lualib clean

run-docker:
docker run --rm --network host -it -v `pwd`:/code ${BUILDER_DOCKER} bash

run-gdb:
riscv64-unknown-linux-gnu-gdb -ex "target remote 127.0.0.1:${PORT}" build/lua-loader.debug
4 changes: 0 additions & 4 deletions tests/official/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ ci:
$(call run_ci, literals.lua)
$(call run_ci, sort.lua)
$(call run_ci, strings.lua)
# RUST_LOG=debug ckb-debugger --max-cycles 2000000000 --read-file math.lua --bin ../../build/lua-loader.debug -- -e 'print(math.mininteger + 1.0)'
# -2.3058430090000e+18
# lua -e 'print(math.mininteger + 1.0)'
# -9.2233720368548e+18
$(call run_ci, math.lua)
$(call run_ci, api.lua)
$(call run_ci, bwcoercion.lua)
Expand Down

0 comments on commit 2d056c4

Please sign in to comment.