From 3aaab3b5a8e8c92d7bd68983930b19474295709b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= <mfro@mubf.de>
Date: Tue, 17 Feb 2015 11:21:41 +0000
Subject: [PATCH] fixed to work for COMPILE_ELF=N again

---
 BaS_gcc/Makefile  | 10 +++++++++-
 BaS_gcc/bas.lk.in |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile
index 25033cc..1ecbbe3 100644
--- a/BaS_gcc/Makefile
+++ b/BaS_gcc/Makefile
@@ -29,7 +29,12 @@ AR=$(TCPREFIX)ar
 RANLIB=$(TCPREFIX)ranlib
 NATIVECC=gcc
 
+ifeq (Y,$(COMPILE_ELF))
 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
 CFLAGS=-mcpu=5474 \
         -g \
@@ -141,11 +146,14 @@ CSRCS= \
 ASRCS= \
 	startcf.S \
 	printf_helper.S \
-	libgcc_helper.S \
 	exceptions.S \
 	xhdi_vec.S \
 	pci_wrappers.S
 
+ifeq (Y,$(COMPILE_ELF))			# needed for __ vs ___ kludge
+	ASRCS += libgcc_helper.S
+endif
+
 SRCS=$(ASRCS) $(CSRCS)
 COBJS=$(patsubst %.c,%.o,$(CSRCS))
 AOBJS=$(patsubst %.S,%.o,$(ASRCS))
diff --git a/BaS_gcc/bas.lk.in b/BaS_gcc/bas.lk.in
index 42c5467..9d3d587 100644
--- a/BaS_gcc/bas.lk.in
+++ b/BaS_gcc/bas.lk.in
@@ -79,7 +79,9 @@ SECTIONS
                 OBJDIR/s19reader.o(.text)
                 OBJDIR/bas_printf.o(.text)
                 OBJDIR/bas_string.o(.text)
+#if (FORMAT_ELF == 1)
                 OBJDIR/libgcc_helper.o(.text)
+#endif
                 OBJDIR/printf_helper.o(.text)
                 OBJDIR/cache.o(.text)
                 OBJDIR/dma.o(.text)