switch to avr-libc 1.8.1 time library

[z180-stamp.git] / avr / Tupfile

diff --git a/avr/Tupfile b/avr/Tupfile
index a50b3b9b4726ddd84114c86c3fa13a8615dc79eb..6c406493579f87cc659329f45da62a199fd87f41 100644 (file)
--- a/avr/Tupfile
+++ b/avr/Tupfile
@@ -1,14 +1,21 @@
 include_rules
 
 PROG           = stamp-monitor
+
+FATFS  = $(TOP)/fatfs/src/ff.c
+
 SRC            = main.c
 SRC            += cli.c cli_readline.c command.c command_tbl.c
 SRC            += cmd_help.c cmd_date.c cmd_mem.c cmd_boot.c cmd_gpio.c cmd_misc.c
-SRC            += cmd_sd.c
-SRC            += env.c xmalloc.c date.c con-utils.c print-utils.c getopt-min.c
+SRC            += cmd_sd.c cmd_fat.c
+SRC            += env.c xmalloc.c con-utils.c print-utils.c getopt-min.c
 SRC            += timer.c serial.c i2c.c pcf8583.c mmc.c
 SRC            += background.c z180-serv.c z80-if.c gpio.c
-SRC            += $(TOP)/fatfs/src/ff.c
+SRC            += $(FATFS) $(TOP)/fatfs/src/option/unicode.c
+
+#TODO: time lib
+SRC            += ../time/asctime_r.c ../time/gmtime_r.c ../time/mk_gmtime.c
+SRC            += ../time/print_lz.c ../time/isLeap.c
 
 SRC_Z          = ../z180/hdrom.c
 
@@ -59,9 +66,9 @@ CFLAGS        += -fno-split-wide-types
 CFLAGS += -fshort-enums
 
 #CFLAGS        +=  -fdiagnostics-color=always
-
 #CFLAGS        += -save-temps
 
+CFLAGS_$(FATFS)        = -fno-strict-aliasing
 
 CFLAGS += $(INCLUDES)
 
@@ -72,7 +79,7 @@ LDFLAGS       += -Wl,--gc-sections
 LDFLAGS        += -Wl,--cref
 
 
-!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) -c %f -o %o |> %B.o
+!cc = |> ^ CC %f^ $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS_%f) -c %f -o %o |> %B.o
 !LINK = |> ^ LINK %o^ $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-Map=%O.map %f $(LDLIBS) -o %o |> | %O.map
 !OBJCOPY= |> ^ OBJCOPY %o^ $(OBJCOPY) -Oihex %f %o |>
 !OBJDUMP= |> ^ OBJDUMP %o^ $(OBJDUMP) -h -S %f > %o |> %O.lss