aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Bradley <wmb@firmworks.com>2016-10-13 11:52:18 -1000
committerMitch Bradley <wmb@firmworks.com>2016-10-13 11:52:18 -1000
commit6b29926df83b109b41bfc2426da3de2a2f548f4b (patch)
tree4ce5728f5def26bee71d5c41a3c4e6476c986265
parentff81d5719f88190a4036fc737a607bda0c669bb4 (diff)
downloadcforth-6b29926df83b109b41bfc2426da3de2a2f548f4b.tar.gz
Oops broke the esp8266 build
-rw-r--r--src/app/esp8266/targets.mk13
-rwxr-xr-xsrc/cforth/compiler.c1
2 files changed, 11 insertions, 3 deletions
diff --git a/src/app/esp8266/targets.mk b/src/app/esp8266/targets.mk
index 4f8a2b7..baaee88 100644
--- a/src/app/esp8266/targets.mk
+++ b/src/app/esp8266/targets.mk
@@ -72,11 +72,20 @@ FORTH_OBJS = tembed.o textend.o
DICTIONARY=ROM
DICTSIZE=0x4000
-app.o: $(PLAT_OBJS) $(FORTH_OBJS) tdate.o
+app.o: tdate.o
@echo Linking $@ ...
@$(TLD) -o $@ -r $(PLAT_OBJS) $(FORTH_OBJS) tdate.o
-tdate.o: date.c
+# This rule builds a date stamp object that you can include in the image
+# if you wish.
+
+tdate.o: $(PLAT_OBJS) $(FORTH_OBJS)
+ @(echo "`git rev-parse --verify --short HEAD``if git diff-index --exit-code --name-only HEAD >/dev/null; then echo '-dirty'; fi`" || echo UNKNOWN) >version
+ @echo 'const char version[] = "'`cat version`'";' >tdate.c
+ @echo 'const char build_date[] = "'`date --utc +%F\ %R`'";' >>tdate.c
+ @cat tdate.c
+ @echo TCC $@
+ @$(TCC) -c tdate.c -o $@
EXTRA_CLEAN += *.elf *.dump *.nm *.img date.c $(FORTH_OBJS) $(PLAT_OBJS)
diff --git a/src/cforth/compiler.c b/src/cforth/compiler.c
index f3f90a2..ba4e34e 100755
--- a/src/cforth/compiler.c
+++ b/src/cforth/compiler.c
@@ -38,7 +38,6 @@ init_compiler(const u_char *origin, u_char *ramorigin, token_t topct, u_char *he
V(RAMTOKENS) = (cell)ramorigin;
V(RAMCT) = (cell)topct;
- printf("TOPCT %x\n", topct);
xlimit -= 4 * sizeof(token_t *); // Guard band