arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-04 18:03:20 +03:00
Code

emulation on host: various minor fixes (#7741)

Browse Source 
* emulation on host: makefile minor fixes
* fix including debug.cpp, fix ranlib log
This commit is contained in:
david gauchard 2020-12-04 02:36:44 +01:00 committed by GitHub
parent 594831d605
commit 47e7b2db6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cores/esp8266/debug.cpp
View File

@ -20,6 +20,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "debug.h" #include "debug.h"
#include "osapi.h"
void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) { void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) {
const uint8_t* src = (const uint8_t*) mem; const uint8_t* src = (const uint8_t*) mem;

12
tests/host/Makefile
View File

@ -62,17 +62,20 @@ VERBC = @echo "C $@";
VERBCXX = @echo "C++ $@"; VERBCXX = @echo "C++ $@";
VERBLD = @echo "LD $@"; VERBLD = @echo "LD $@";
VERBAR = @echo "AR $@"; VERBAR = @echo "AR $@";
VERBRANLIB = @echo "RANLIB $@";
else else
VERBC = VERBC =
VERBCXX = VERBCXX =
VERBLD = VERBLD =
VERBAR = VERBAR =
VERBRANLIB =
endif endif
$(shell mkdir -p $(BINDIR)) $(shell mkdir -p $(BINDIR))
CORE_CPP_FILES := \ CORE_CPP_FILES := \
$(addprefix $(abspath $(CORE_PATH))/,\ $(addprefix $(abspath $(CORE_PATH))/,\
debug.cpp \
StreamString.cpp \ StreamString.cpp \
Stream.cpp \ Stream.cpp \
WString.cpp \ WString.cpp \
@ -226,7 +229,10 @@ test: $(OUTPUT_BINARY) # run host test for CI
$(OUTPUT_BINARY) $(OUTPUT_BINARY)
.PHONY: clean .PHONY: clean
clean: clean-objects clean: clean-lcov clean-objects
.PHONY: clean-lcov
clean-lcov:
rm -rf $(LCOV_DIRECTORY) rm -rf $(LCOV_DIRECTORY)
.PHONY: clean-objects .PHONY: clean-objects
@ -379,7 +385,7 @@ FULLCORE_OBJECTS_ISOLATED = $(FULLCORE_OBJECTS:%.o=$(BINDIR)/%.o)
$(BINDIR)/fullcore.a: $(FULLCORE_OBJECTS_ISOLATED) $(BINDIR)/fullcore.a: $(FULLCORE_OBJECTS_ISOLATED)
$(VERBAR) $(AR) rc $@ $^ $(VERBAR) $(AR) rc $@ $^
$(VERBAR) $(RANLIB) $@ $(VERBRANLIB) $(RANLIB) $@
ifeq ($(INO),) ifeq ($(INO),)
@ -392,7 +398,7 @@ else
$(VERBLD) $(CXX) $(LDFLAGS) $< $(BINDIR)/fullcore.a $(LIBSSL) -o $@ $(VERBLD) $(CXX) $(LDFLAGS) $< $(BINDIR)/fullcore.a $(LIBSSL) -o $@
mkdir -p $(BINDIR)/$(lastword $(subst /, ,$@)) mkdir -p $(BINDIR)/$(lastword $(subst /, ,$@))
ln -sf $@ $(BINDIR)/$(lastword $(subst /, ,$@)) ln -sf $@ $(BINDIR)/$(lastword $(subst /, ,$@))
@echo "----> $(BINDIR)/ <----" @echo "----> $(BINDIR)/$(lastword $(subst /, ,$@))/$(lastword $(subst /, ,$@)) <----"
@[ "$(R)" = noexec ] && echo '(not running it, use `make R="[<options>]" ...` for valgrind+gdb)' || $(dir $(MAKEFILE))/valgdb $@ $(R) @[ "$(R)" = noexec ] && echo '(not running it, use `make R="[<options>]" ...` for valgrind+gdb)' || $(dir $(MAKEFILE))/valgdb $@ $(R)
FORCE: FORCE: