aboutsummaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2017-05-10 00:00:04 -0400
committerPaul Selkirk <paul@psgd.org>2017-09-07 18:11:01 -0400
commit03d7fa26a89d44349df86e29ac782d075856c570 (patch)
treed2b70efd350b17e67896118e60aca392560fdec4 /projects
parentb2858c0eabeb2aba36ad7b5a964d52e51711c8df (diff)
Sigh, right offset for the wrong register. Get the PC (the address we
interrupted) rather than LR (the return address from the function we interrupted). Also, change u_short and u_int to unsigned short and unsigned int, since gcc recently decided that those aren't part of the C99 standard. Finally, add profilable versions of memcpy, memset, and friends, because they get called a lot in the course of unit testing, and it would be nice to know who's calling them.
Diffstat (limited to 'projects')
-rw-r--r--projects/hsm/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/projects/hsm/Makefile b/projects/hsm/Makefile
index 7efd41d..429069d 100644
--- a/projects/hsm/Makefile
+++ b/projects/hsm/Makefile
@@ -9,9 +9,8 @@ OBJS = mgmt-cli.o \
mgmt-masterkey.o \
mgmt-misc.o \
mgmt-task.o \
- log.o
-
-BOARD_OBJS += $(TOPLEVEL)/task.o
+ log.o \
+ $(TOPLEVEL)/task.o
CFLAGS += -DTASK_METRICS
@@ -28,6 +27,7 @@ LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
LDFLAGS += -Wl,--gc-sections
ifdef DO_PROFILING
+OBJS += $(TOPLEVEL)/memfunc.o
LIBS += $(LIBPROF_BLD)/libprof.a
LDFLAGS += --specs=rdimon.specs -lc -lrdimon
endif
@@ -35,7 +35,7 @@ endif
all: $(PROJ:=.elf)
%.elf: %.o $(BOARD_OBJS) $(OBJS) $(LIBS)
- $(CC) $(LDFLAGS) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map
+ $(CC) $^ -o $@ -T$(LDSCRIPT) -g -Wl,-Map=$*.map $(LDFLAGS)
$(OBJCOPY) -O binary $*.elf $*.bin
$(SIZE) $*.elf