From f15bff15609ff4b12d2146082e89b036fa852d55 Mon Sep 17 00:00:00 2001 From: rexy712 Date: Wed, 26 Jan 2022 18:20:14 -0800 Subject: [PATCH] Add definitions to check programatically if MEMCHK or UNDEFCHK is active --- makefile.basic | 4 ++-- makefile.exe_progress | 4 ++-- makefile.library | 4 ++-- makefile.reclib | 5 +++-- makefile.recursive | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/makefile.basic b/makefile.basic index 25ac91e..b9793b9 100644 --- a/makefile.basic +++ b/makefile.basic @@ -126,11 +126,11 @@ ifneq ($(RELEASE),1) ifeq ($(MEMCHK),1) #use asan to check memory leaks/invalid accesses LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls - COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls + COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -DENABLE_MEMCHK=1 endif ifeq ($(UNDEFCHK),1) LDFLAGS+=-fsanitize=undefined - COMPILER_FLAGS+=-fsanitize=undefined + COMPILER_FLAGS+=-fsanitize=undefined -DENABLE_UNDEFCHK=1 endif endif diff --git a/makefile.exe_progress b/makefile.exe_progress index d64c483..c6b34be 100644 --- a/makefile.exe_progress +++ b/makefile.exe_progress @@ -123,11 +123,11 @@ ifneq ($(RELEASE),1) ifeq ($(MEMCHK),1) #use asan to check memory leaks/invalid accesses LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls - COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls + COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -DENABLE_MEMCHK=1 endif ifeq ($(UNDEFCHK),1) LDFLAGS+=-fsanitize=undefined - COMPILER_FLAGS+=-fsanitize=undefined + COMPILER_FLAGS+=-fsanitize=undefined -DENABLE_UNDEFCHK=1 endif endif diff --git a/makefile.library b/makefile.library index 5ec75a8..0e14025 100644 --- a/makefile.library +++ b/makefile.library @@ -139,11 +139,11 @@ ifneq ($(RELEASE),1) ifeq ($(MEMCHK),1) #use asan to check memory leaks/invalid accesses LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls - COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls + COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -DENABLE_MEMCHK=1 endif ifeq ($(UNDEFCHK),1) LDFLAGS+=-fsanitize=undefined - COMPILER_FLAGS+=-fsanitize=undefined + COMPILER_FLAGS+=-fsanitize=undefined -DENABLE_UNDEFCHK=1 endif endif diff --git a/makefile.reclib b/makefile.reclib index a86eb7b..fe4b4c2 100644 --- a/makefile.reclib +++ b/makefile.reclib @@ -128,13 +128,14 @@ else ifeq ($(LANG),c) endif ifneq ($(RELEASE),1) + ifeq ($(MEMCHK),1) #use asan to check memory leaks/invalid accesses LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls - COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls + COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -DENABLE_MEMCHK=1 endif ifeq ($(UNDEFCHK),1) LDFLAGS+=-fsanitize=undefined - COMPILER_FLAGS+=-fsanitize=undefined + COMPILER_FLAGS+=-fsanitize=undefined -DENABLE_UNDEFCHK=1 endif endif diff --git a/makefile.recursive b/makefile.recursive index 2dc76eb..bccc288 100644 --- a/makefile.recursive +++ b/makefile.recursive @@ -123,11 +123,11 @@ ifneq ($(RELEASE),1) ifeq ($(MEMCHK),1) #use asan to check memory leaks/invalid accesses LDFLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls - COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls + COMPILER_FLAGS+=-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -DENABLE_MEMCHK=1 endif ifeq ($(UNDEFCHK),1) LDFLAGS+=-fsanitize=undefined - COMPILER_FLAGS+=-fsanitize=undefined + COMPILER_FLAGS+=-fsanitize=undefined -DENABLE_UNDEFCHK=1 endif endif