From 4a5b4c643ea18a3b2bb70ef67d42fec6696a64c1 Mon Sep 17 00:00:00 2001
From: nealcrook <neal@pippaluk.org.uk>
Date: Tue, 15 Nov 2016 10:25:15 +0000
Subject: [PATCH] Bring in line with master so that this will merge cleanly

---
 Applications/levee/Makefile.6809 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Applications/levee/Makefile.6809 b/Applications/levee/Makefile.6809
index 634acef2..727c0681 100644
--- a/Applications/levee/Makefile.6809
+++ b/Applications/levee/Makefile.6809
@@ -1,12 +1,13 @@
 PLATFORM = 6809
 CC = m6809-unknown-gcc
-# These are wrappers for lwasm and lwar
 ASM = m6809-unknown-as
 AR = m6809-unknown-ar
-LINKER = lwlink
+LINKER = m6809-unknown-ld
 CFLAGS = -I../../Library/include -I../../Library/include/6809
 COPT = -Os -fomit-frame-pointer
-LINKER_OPT = --format=raw -L../../Library/libs -lc6809
+# Workaround for gcc6809 bug - register copy propagation issue
+COPT += -fno-cprop-registers
+LINKER_OPT = --oformat=raw -L../../Library/libs -lc6809
 LIBGCCDIR = $(dir $(shell $(CC) -print-libgcc-file-name))
 LINKER_OPT += -L$(LIBGCCDIR) -lgcc
 LINKER_OPT += --script=../util/$(TARGET).link
-- 
2.34.1