Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed to work for COMPILE_ELF=N again

Browse Source
This commit is contained in:
Markus Fröschle
2015-02-17 11:21:41 +00:00
parent ed5f1fb64c
commit 5cf48838c6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -29,7 +29,12 @@ AR=$(TCPREFIX)ar
RANLIB=$(TCPREFIX)ranlib RANLIB=$(TCPREFIX)ranlib
NATIVECC=gcc NATIVECC=gcc
ifeq (Y,$(COMPILE_ELF))
LDLIBS=-L/usr/lib/gcc/m68k-elf/4.9.2/m5475 -lgcc LDLIBS=-L/usr/lib/gcc/m68k-elf/4.9.2/m5475 -lgcc
else
LDLIBS=-L/usr/lib/gcc/m68k-atari-mint/4.6.4/m5475 -lgcc
endif
INCLUDE=-Iinclude INCLUDE=-Iinclude
CFLAGS=-mcpu=5474 \ CFLAGS=-mcpu=5474 \
-g \ -g \
@@ -141,11 +146,14 @@ CSRCS= \
ASRCS= \ ASRCS= \
startcf.S \ startcf.S \
printf_helper.S \ printf_helper.S \
libgcc_helper.S \
exceptions.S \ exceptions.S \
xhdi_vec.S \ xhdi_vec.S \
pci_wrappers.S pci_wrappers.S
ifeq (Y,$(COMPILE_ELF)) # needed for __ vs ___ kludge
ASRCS += libgcc_helper.S
endif
SRCS=$(ASRCS) $(CSRCS) SRCS=$(ASRCS) $(CSRCS)
COBJS=$(patsubst %.c,%.o,$(CSRCS)) COBJS=$(patsubst %.c,%.o,$(CSRCS))
AOBJS=$(patsubst %.S,%.o,$(ASRCS)) AOBJS=$(patsubst %.S,%.o,$(ASRCS))

2
bas.lk.in
View File

@@ -79,7 +79,9 @@ SECTIONS
OBJDIR/s19reader.o(.text) OBJDIR/s19reader.o(.text)
OBJDIR/bas_printf.o(.text) OBJDIR/bas_printf.o(.text)
OBJDIR/bas_string.o(.text) OBJDIR/bas_string.o(.text)
#if (FORMAT_ELF == 1)
OBJDIR/libgcc_helper.o(.text) OBJDIR/libgcc_helper.o(.text)
#endif
OBJDIR/printf_helper.o(.text) OBJDIR/printf_helper.o(.text)
OBJDIR/cache.o(.text) OBJDIR/cache.o(.text)
OBJDIR/dma.o(.text) OBJDIR/dma.o(.text)