From 901a1807749d2276f9ae1a6c516227cdf04f243b Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 26 Feb 2022 13:48:51 -0500 Subject: [PATCH] dead code: THUMB really does not apply here --- unit_tests/rules.mk | 36 +++++------------------------------ unit_tests/unit_test_rules.mk | 14 -------------- 2 files changed, 5 insertions(+), 45 deletions(-) diff --git a/unit_tests/rules.mk b/unit_tests/rules.mk index 701f520a97..f48d5c98e4 100644 --- a/unit_tests/rules.mk +++ b/unit_tests/rules.mk @@ -19,17 +19,11 @@ ifeq ($(USE_LINK_GC),yes) OPT += -ffunction-sections -fdata-sections -fno-common endif -# Source files groups and paths -ifeq ($(USE_THUMB),yes) - TCSRC += $(CSRC) - TCPPSRC += $(CPPSRC) -else - ACSRC += $(CSRC) - ACPPSRC += $(CPPSRC) -endif +ACSRC += $(CSRC) +ACPPSRC += $(CPPSRC) + ASRC = $(ACSRC)$(ACPPSRC) -TSRC = $(TCSRC)$(TCPPSRC) -SRCPATHS = $(sort $(dir $(ASMXSRC)) $(dir $(ASMSRC)) $(dir $(ASRC)) $(dir $(TSRC))) +SRCPATHS = $(sort $(dir $(ASMXSRC)) $(dir $(ASMSRC)) $(dir $(ASRC))) # Various directories OBJDIR = $(BUILDDIR)/obj @@ -38,11 +32,9 @@ LSTDIR = $(BUILDDIR)/lst # Object files groups ACOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ACSRC:.c=.o))) ACPPOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ACPPSRC:.cpp=.o))) -TCOBJS = $(addprefix $(OBJDIR)/, $(notdir $(TCSRC:.c=.o))) -TCPPOBJS = $(addprefix $(OBJDIR)/, $(notdir $(TCPPSRC:.cpp=.o))) ASMOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMSRC:.s=.o))) ASMXOBJS = $(addprefix $(OBJDIR)/, $(notdir $(ASMXSRC:.S=.o))) -OBJS = $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(TCOBJS) $(ACPPOBJS) $(TCPPOBJS) +OBJS = $(ASMXOBJS) $(ASMOBJS) $(ACOBJS) $(ACPPOBJS) # Paths IINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR)) @@ -112,15 +104,6 @@ else @$(CPPC) -c $(CPPFLAGS) $(AOPT) -I. $(IINCDIR) $< -o $@ endif -$(TCPPOBJS) : $(OBJDIR)/%.o : %.cpp Makefile -ifeq ($(USE_VERBOSE_COMPILE),yes) - @echo - $(CPPC) -c $(CPPFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ -else - @echo Compiling $(