From 6510249052924798135583d2f150761a63661d85 Mon Sep 17 00:00:00 2001 From: tracer-ics2023 Date: Mon, 9 Sep 2024 23:41:16 +0800 Subject: [PATCH] =?UTF-8?q?>=20=20compile=20NEMU=20221220000=20=E5=BC=A0?= =?UTF-8?q?=E4=B8=89=20Linux=20zzy=205.15.146.1-microsoft-standard-WSL2=20?= =?UTF-8?q?#1=20SMP=20Thu=20Jan=2011=2004:09:03=20UTC=202024=20x86=5F64=20?= =?UTF-8?q?x86=5F64=20x86=5F64=20GNU/Linux=20=2023:41:15=20up=204=20days,?= =?UTF-8?q?=2011:49,=20=203=20users,=20=20load=20average:=200.74,=200.48,?= =?UTF-8?q?=200.41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nemu/Makefile | 1 + nemu/scripts/build.mk | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nemu/Makefile b/nemu/Makefile index 44eee8b..0991508 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -46,6 +46,7 @@ CFLAGS_BUILD += $(if $(CONFIG_CC_LTO),-flto,) CFLAGS_BUILD += $(if $(CONFIG_CC_DEBUG),-Og -ggdb3,) CFLAGS_BUILD += $(if $(CONFIG_CC_ASAN),-fsanitize=address,) CFLAGS_TRACE += -DITRACE_COND=$(if $(CONFIG_ITRACE_COND),$(call remove_quote,$(CONFIG_ITRACE_COND)),true) +CFLAGS_TRACE += -DMTRACE_COND=$(if $(CONFIG_MTRACE_COND),$(call remove_quote,$(CONFIG_MTRACE_COND)),true) CFLAGS += $(CFLAGS_BUILD) $(CFLAGS_TRACE) -D__GUEST_ISA__=$(GUEST_ISA) LDFLAGS += $(CFLAGS_BUILD) diff --git a/nemu/scripts/build.mk b/nemu/scripts/build.mk index ff7bae5..51350e8 100644 --- a/nemu/scripts/build.mk +++ b/nemu/scripts/build.mk @@ -22,8 +22,7 @@ CXX := g++ endif LD := $(CXX) INCLUDES = $(addprefix -I, $(INC_PATH)) -DEFINE = _ -CFLAGS := -O2 -MMD -Wall -Werror $(INCLUDES) $(CFLAGS) -D$(DEFINE) +CFLAGS := -O2 -MMD -Wall -Werror $(INCLUDES) $(CFLAGS) LDFLAGS := -O2 $(LDFLAGS) OBJS = $(SRCS:%.c=$(OBJ_DIR)/%.o) $(CXXSRC:%.cc=$(OBJ_DIR)/%.o)