From 73a1979bf5f56e8d7a9cab0316f3e36e5bc6a51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= <mfro@mubf.de>
Date: Tue, 30 Oct 2012 11:44:40 +0000
Subject: [PATCH] modified to support both m68k-elf (needed for source level
 debugging) as well as m68k-atari-mint toolchains

---
 Makefile  | 9 +++++++--
 bas.lk.in | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b5ed5a0..b40b6a0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,11 @@ COMPILE_ELF=N
 ifeq (Y,$(COMPILE_ELF))
 TCPREFIX=m68k-elf-
 EXE=elf
+FORMAT=elf32-m68k
 else 
 TCPREFIX=m68k-atari-mint-
 EXE=s19
+FORMAT=srec
 endif
 
 CC=$(TCPREFIX)gcc
@@ -26,6 +28,7 @@ OBJCOPY=$(TCPREFIX)objcopy
 INCLUDE=-Iinclude
 CFLAGS=-mcpu=5474\
 	   -Wall\
+	   -g\
 	   -Wno-multichar\
 	   -Os\
 	   -fomit-frame-pointer\
@@ -83,9 +86,11 @@ $(FLASH_EXEC): TARGET_ADDRESS=0xe0000000
 $(RAM_EXEC): TARGET_ADDRESS=0x10000000
 
 $(FLASH_EXEC) $(RAM_EXEC): $(STRT_OBJ) $(OBJS)
-	$(CPP) -P -DTARGET_ADDRESS=$(TARGET_ADDRESS) $(LDCSRC) -o $(LDCFILE)
-	$(LD) --oformat srec -Map $(MAPFILE) --cref -T $(LDCFILE) -o $@
+	$(CPP) -P -DTARGET_ADDRESS=$(TARGET_ADDRESS) -DFORMAT=$(FORMAT) $(LDCSRC) -o $(LDCFILE)
+	$(LD) --oformat $(FORMAT) -Map $(MAPFILE) --cref -T $(LDCFILE) -o $@
+ifneq ($(COMPILE_ELF),Y)
 	objcopy -I srec -O elf32-big --alt-machine-code 4 $@ $@.elf
+endif
 	
 # compile init_fpga with -mbitfield for testing purposes
 $(OBJDIR)/init_fpga.o:	CFLAGS += -mbitfield
diff --git a/bas.lk.in b/bas.lk.in
index 7c6d041..ad8f284 100644
--- a/bas.lk.in
+++ b/bas.lk.in
@@ -90,6 +90,10 @@ SECTIONS {
 		*(.data)
 		*(.bss)
 		
+#if (FORMAT == elf32-m68k)
+	*(.rodata)
+	*(.rodata.*)
+#endif
 		_bas_end = ABSOLUTE(.);
 	} > ram