Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
herumi committed Aug 29, 2023
2 parents caf27db + 3a2620b commit 4a823f9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: lscpu
- run: sudo apt update
- run: sudo apt install valgrind nasm
Expand All @@ -25,6 +25,8 @@ jobs:
- run: make clean
- run: make test_ci DEBUG=1 -j4 CXX=clang++ MCL_USE_XBYAK=0 MCL_USE_LLVM=0
- run: make clean
- run: make test_ci DEBUG=4 -j4 CXX=clang++
- run: make clean
# - run: make test_go
# - run: sudo apt install openjdk-8-jdk
# - run: make -C ffi/java test JAVA_INC=-I/usr/lib/jvm/java-8-openjdk-amd64/include
17 changes: 8 additions & 9 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,24 @@ RM=rm -rf
DEBUG?=0
ifeq ($(DEBUG),1)
ifeq ($(GCC_EXT),1)
CFLAGS+=-fsanitize=address
LDFLAGS+=-fsanitize=address
SANITIZE_OPT?=-fsanitize=address
endif
endif
ifeq ($(DEBUG),2)
ifeq ($(GCC_EXT),1)
CFLAGS+=-fsanitize=memory -fsanitize-memory-track-origins=2
LDFLAGS+=-fsanitize=memory -fsanitize-memory-track-origins=2
SANITIZE_OPT?=-fsanitize=memory -fsanitize-memory-track-origins=2
endif
endif
ifeq ($(DEBUG),3)
# no option
endif
ifeq ($(DEBUG),4)
ifeq ($(GCC_EXT),1)
CFLAGS+=-fsanitize=undefined
LDFLAGS+=-fsanitize=undefined
SANITIZE_OPT?=-fsanitize=undefined -fno-sanitize-recover
endif
endif
ifeq ($(DEBUG),3)
# no option
endif
CFLAGS+=$(SANITIZE_OPT)
LDFLAGS+=$(SANITIZE_OPT)
ifeq ($(DEBUG),0)
CFLAGS_OPT+=-fomit-frame-pointer -DNDEBUG -fno-stack-protector
ifeq ($(CXX),clang++)
Expand Down

0 comments on commit 4a823f9

Please sign in to comment.