diff options
| author | Keith Packard <keithp@keithp.com> | 2018-08-05 12:23:22 +0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2018-10-13 08:21:58 -0700 |
| commit | 7c04888cf9809e0c73f0813c74e8dd972facde3a (patch) | |
| tree | ebb43ee5aa61cc65ce28595c19b4dd3c19812ead /src/stm | |
| parent | 56629222711ba3ef7853405c9b07ad614fb29b95 (diff) | |
altos: Switch to newlib-nano for libc on arm
Stop using pdclib
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stm')
| -rw-r--r-- | src/stm/Makefile-flash.defs | 10 | ||||
| -rw-r--r-- | src/stm/Makefile.defs | 9 | ||||
| -rw-r--r-- | src/stm/ao_arch.h | 10 |
3 files changed, 13 insertions, 16 deletions
diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs index dde51a68..66ad1637 100644 --- a/src/stm/Makefile-flash.defs +++ b/src/stm/Makefile-flash.defs @@ -12,10 +12,14 @@ endif include $(TOPDIR)/Makedefs CC=$(ARM_CC) -LIBS=$(PDCLIB_LIBS_M3) -lgcc +LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lc -lm -lgcc -AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR) $(PDCLIB_INCLUDES) -STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS) +AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ + -DNEWLIB_INTEGER_PRINTF_SCANF \ + -I$(TOPDIR)/product -I$(TOPDIR) -isystem $(NEWLIB_NANO)/arm-none-eabi/include + +STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb \ + -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS) LDFLAGS=-L$(TOPDIR)/stm -Wl,-Taltos-loader.ld diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs index 4d0d27c7..8173b349 100644 --- a/src/stm/Makefile.defs +++ b/src/stm/Makefile.defs @@ -22,15 +22,18 @@ endif include $(TOPDIR)/Makedefs CC=$(ARM_CC) -LIBS=$(PDCLIB_LIBS_M3) -lgcc +LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lm -lc -lgcc WARN_FLAGS=-Wall -Wextra -Werror -AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I../draw -I../lisp -I.. $(PDCLIB_INCLUDES) +AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I../draw \ + -DNEWLIB_INTEGER_PRINTF_SCANF \ + -I../lisp -I.. -isystem $(NEWLIB_NANO)/arm-none-eabi/include + STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -Wcast-align \ -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) -LDFLAGS=-L../stm -Wl,-Taltos.ld +LDFLAGS=-L../stm -Wl,-Taltos.ld -nostartfiles -Wl,-Map=$(PROGNAME).map NICKLE=nickle ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h index 679dba44..7b08b891 100644 --- a/src/stm/ao_arch.h +++ b/src/stm/ao_arch.h @@ -57,16 +57,6 @@ #define ao_arch_interrupt(n) /* nothing */ -#undef putchar -#undef getchar -#define putchar(c) ao_putchar(c) -#define getchar ao_getchar - -extern void putchar(char c); -extern char getchar(void); -extern void ao_avr_stdio_init(void); - - /* * ao_romconfig.c */ |