FreeCalypso > hg > freecalypso-tools
view target-utils/flash-boot-test/Makefile @ 964:a96cb97b66a2
ringtools/imy: fix duplicate definition of tdma_durations[]
The bug was reported by Vadim Yanitskiy <fixeria@osmocom.org>,
although the present fix is slightly different from the contributed
patch: because main.c doesn't need this tdma_durations[] array
at all, let's simply remove the reference to this array from main.c
rather than turn it into an extern.
I no longer remember my original thought flow that resulted (by mistake)
in tdma_durations[] being multiply defined in main.c and durations.c.
My intent might have been to define all globals in main.c and have
the reference in durations.c be an extern - and I missed that extern -
but without clear memory, I have no certainty. In any case, having
this data array defined in the same module that fills it (durations.c)
is sensible, so let's make it the new way.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 31 Aug 2023 19:38:18 +0000 |
parents | bfddfecc52b2 |
children |
line wrap: on
line source
CC= arm-elf-gcc CFLAGS= -Os -fno-builtin CPPFLAGS=-I../include LD= arm-elf-ld OBJCOPY=arm-elf-objcopy OBJS= vectors.o crt0.o cmdtab.o main.o uartbase.o uartinit.o watchdog.o LIBS= ../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \ ../libc/libc.a LIBGCC= `${CC} -print-file-name=libgcc.a` LDS= ld.script all: fbt-mode0.bin fbt-mode1.bin crt0.S: ln -s ../env/crt0.S . fbt-mode0.elf: ${OBJS} magic0.o ${LIBS} ${LDS} ${LD} -N -T ${LDS} -o $@ ${OBJS} magic0.o ${LIBS} ${LIBGCC} fbt-mode0.bin: fbt-mode0.elf ${OBJCOPY} -O binary $< $@ fbt-mode1.elf: ${OBJS} magic1.o ${LIBS} ${LDS} ${LD} -N -T ${LDS} -o $@ ${OBJS} magic1.o ${LIBS} ${LIBGCC} fbt-mode1.bin: fbt-mode1.elf ${OBJCOPY} -O binary $< $@ clean: rm -f *.o *errs *core *.elf *.bin *.srec crt0.S FRC: