From e5497f2ac058acb427b6fcdd15db6adeddd7bc55 Mon Sep 17 00:00:00 2001
From: inmarket <inmarket@ugfx.io>
Date: Sat, 24 Jun 2017 17:12:42 +1000
Subject: [PATCH] Add support for .S files to the gcc make system

---
 tools/gmake_scripts/compiler_gcc.mk | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/gmake_scripts/compiler_gcc.mk b/tools/gmake_scripts/compiler_gcc.mk
index 23912992..07cb8ec8 100644
--- a/tools/gmake_scripts/compiler_gcc.mk
+++ b/tools/gmake_scripts/compiler_gcc.mk
@@ -215,7 +215,13 @@ ifneq ($(OPT_VERBOSE_COMPILE),yes)
   ifneq ($(filter %.s,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),)
 	@echo .
 	@echo Assembler Options.....
-	@echo $(XCC) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.s) -o $(OBJDIR)/$@
+	@echo $(XAS) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.s) -o $(OBJDIR)/$@
+  else
+   ifneq ($(filter %.S,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),)
+	@echo .
+	@echo Assembler Options.....
+	@echo $(XAS) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.S) -o $(OBJDIR)/$@
+   endif
   endif
   ifneq ($(OPT_MAKE_LIB),yes)
 	@echo .
@@ -278,6 +284,16 @@ else
 	@$(XAS) -c $(CPPFLAGS) $(ASFLAGS) $(SRCFLAGS) $< -o $@
 endif
 
+$(OBJDIR)/%.o : $$(call obj_src,%.S)
+	@mkdir -p $(dir $@)
+ifeq ($(OPT_VERBOSE_COMPILE),yes)
+	@echo .
+	$(XAS) -c $(CPPFLAGS) $(ASFLAGS) $(SRCFLAGS) $< -o $@
+else
+	@echo Compiling $<
+	@$(XAS) -c $(CPPFLAGS) $(ASFLAGS) $(SRCFLAGS) $< -o $@
+endif
+
 $(EXEFILE): $(OBJS_THUMB) $(OBJS_NOTHUMB) $(LDSCRIPT)
 	@mkdir -p $(dir $@)
 ifeq ($(OPT_VERBOSE_COMPILE),yes)