diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-07-09 22:26:02 +0200 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-07-09 22:26:02 +0200 |
| commit | 28210c85a92d3f38efc98581621735605dec1ad1 (patch) | |
| tree | f09b9c63104f73d6fb21b7499372d1d3726d663e | |
| parent | da5f42be21263a5f87d0ab4a7f13fc1ca2a007eb (diff) | |
Took another couple of changes from @peplin's PR #256 for chipKIT
| -rw-r--r-- | Arduino.mk | 2 | ||||
| -rw-r--r-- | chipKIT.mk | 14 |
2 files changed, 11 insertions, 5 deletions
@@ -1407,7 +1407,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) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS) $(AR) rcs $@ $(CORE_OBJS) $(LIB_OBJS) $(PLATFORM_LIB_OBJS) $(USER_LIB_OBJS) @@ -81,7 +81,11 @@ ARDUINO_CORE_PATH = $(ALTERNATE_CORE_PATH)/cores/$(ALTERNATE_CORE) ARDUINO_PREFERENCES_PATH = $(MPIDE_PREFERENCES_PATH) ARDUINO_DIR = $(MPIDE_DIR) -CORE_AS_SRCS = $(ARDUINO_CORE_PATH)/vector_table.S +CORE_AS_SRCS = $(ARDUINO_CORE_PATH)/vector_table.S \ + $(ARDUINO_CORE_PATH)/cpp-startup.S \ + $(ARDUINO_CORE_PATH)/crti.S \ + $(ARDUINO_CORE_PATH)/crtn.S \ + $(ARDUINO_CORE_PATH)/pic32_software_reset.S ARDUINO_VERSION = 23 @@ -107,9 +111,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 -CPPFLAGS += -mno-smart-io -fno-short-double +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_BOARD_MEGA_ CFLAGS_STD = include $(ARDMK_DIR)/Arduino.mk |