From 6f9e04c37df1f9a1e735c3438da8c967bdc10f25 Mon Sep 17 00:00:00 2001
From: Christopher Peplin <chris.peplin@rhubarbtech.com>
Date: Sat, 6 Sep 2014 17:33:34 -0400
Subject: [PATCH] List linker scripts at end of LD to make sure dependencies
 are in order.

---
 Arduino.mk | 2 +-
 chipKIT.mk | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Arduino.mk b/Arduino.mk
index 23e9d792..aaf6ed7f 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1120,7 +1120,7 @@ pre-build:
 		$(call runscript_if_exists,$(PRE_BUILD_HOOK))
 
 $(TARGET_ELF): 	$(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
-		$(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -lc -lm
+		$(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -lc -lm $(LINKER_SCRIPTS)
 
 $(CORE_LIB):	$(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
 		$(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
diff --git a/chipKIT.mk b/chipKIT.mk
index ba3d6be1..16d5016f 100644
--- a/chipKIT.mk
+++ b/chipKIT.mk
@@ -102,11 +102,11 @@ LDSCRIPT = $(call PARSE_BOARD,$(BOARD_TAG),ldscript)
 LDSCRIPT_FILE = $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
 
 MCU_FLAG_NAME=mprocessor
-LDFLAGS  += -T$(ARDUINO_CORE_PATH)/$(LDSCRIPT)
-LDFLAGS  += -T$(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld
-LDFLAGS  += -mno-peripheral-libs -nostartfiles -Wl,--gc-sections
+LDFLAGS  += -mdebugger -mno-peripheral-libs -nostartfiles -Wl,--gc-sections
+LINKER_SCRIPTS  += -T $(ARDUINO_CORE_PATH)/$(LDSCRIPT)
+LINKER_SCRIPTS  += -T $(ARDUINO_CORE_PATH)/chipKIT-application-COMMON.ld
 CPPFLAGS += -mno-smart-io -fno-short-double -fframe-base-loclist \
-			-g3 -Wcast-align -D__PROG_TYPES_COMPAT__
+			-g3 -Wcast-align -D_BOARD_MEGA_
 CFLAGS_STD =
 
 include $(ARDMK_DIR)/Arduino.mk