From b18f2d8f2f64547563d1f5543d11e835f7a30368 Mon Sep 17 00:00:00 2001
From: mtei <2170248+mtei@users.noreply.github.com>
Date: Tue, 16 Apr 2019 00:32:34 +0900
Subject: [PATCH 1/3] fix LIB_SRC and QUANTUM_LIB_SRC for ARM(chibios)

---
 tmk_core/avr.mk     | 4 +++-
 tmk_core/chibios.mk | 2 ++
 tmk_core/rules.mk   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index f6af3f5e2908..4e85ed20d810 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -6,7 +6,7 @@ CC = avr-gcc
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 SIZE = avr-size
-AR = avr-ar rcs
+AR = avr-ar
 NM = avr-nm
 HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
@@ -14,6 +14,8 @@ BIN =
 
 COMMON_VPATH += $(DRIVER_PATH)/avr
 
+ARFLAGS =  rcs
+
 COMPILEFLAGS += -funsigned-char
 COMPILEFLAGS += -funsigned-bitfields
 COMPILEFLAGS += -ffunction-sections
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 01edebfd74c7..0eb2f435265f 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -151,6 +151,8 @@ BIN = $(OBJCOPY) -O binary
 
 COMMON_VPATH += $(DRIVER_PATH)/arm
 
+ARFLAGS =  rcs
+
 THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
 
 COMPILEFLAGS += -fomit-frame-pointer
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 3a322cee4f25..6e34ee6115b2 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -331,7 +331,7 @@ $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN)
 $1/%.a : $1/%.o
 	@mkdir -p $$(@D)
 	@$(SILENT) || printf "Archiving: $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(AR) $$@ $$<)
+	$$(eval CMD=$$(AR) $$(ARFLAGS) $$@ $$<)
 	@$$(BUILD_CMD)
 
 $1/force:

From b85296ff6178b9a192bc4119284ad6da383a4a9c Mon Sep 17 00:00:00 2001
From: mtei <2170248+mtei@users.noreply.github.com>
Date: Tue, 16 Apr 2019 15:52:00 +0900
Subject: [PATCH 2/3] remove ARFLAGS

---
 tmk_core/avr.mk     | 2 --
 tmk_core/chibios.mk | 2 --
 tmk_core/rules.mk   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 4e85ed20d810..6bf86d58a8c9 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -14,8 +14,6 @@ BIN =
 
 COMMON_VPATH += $(DRIVER_PATH)/avr
 
-ARFLAGS =  rcs
-
 COMPILEFLAGS += -funsigned-char
 COMPILEFLAGS += -funsigned-bitfields
 COMPILEFLAGS += -ffunction-sections
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 0eb2f435265f..01edebfd74c7 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -151,8 +151,6 @@ BIN = $(OBJCOPY) -O binary
 
 COMMON_VPATH += $(DRIVER_PATH)/arm
 
-ARFLAGS =  rcs
-
 THUMBFLAGS = -DTHUMB_PRESENT -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb -DTHUMB
 
 COMPILEFLAGS += -fomit-frame-pointer
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 6e34ee6115b2..6d2bb51f075d 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -331,7 +331,7 @@ $1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN)
 $1/%.a : $1/%.o
 	@mkdir -p $$(@D)
 	@$(SILENT) || printf "Archiving: $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(AR) $$(ARFLAGS) $$@ $$<)
+	$$(eval CMD=$$(AR) rcs $$@ $$<)
 	@$$(BUILD_CMD)
 
 $1/force:

From 614f5c57c33533831a855d43f9d20ec851a53584 Mon Sep 17 00:00:00 2001
From: mtei <2170248+mtei@users.noreply.github.com>
Date: Tue, 16 Apr 2019 16:41:27 +0900
Subject: [PATCH 3/3] tmk_core/arm_atsam.mk:AR: remove 'rcs'

---
 tmk_core/arm_atsam.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk
index 06823fb629f9..25a3411f4f9f 100644
--- a/tmk_core/arm_atsam.mk
+++ b/tmk_core/arm_atsam.mk
@@ -6,7 +6,7 @@ CC = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
 OBJDUMP = arm-none-eabi-objdump
 SIZE = arm-none-eabi-size
-AR = arm-none-eabi-ar rcs
+AR = arm-none-eabi-ar
 NM = arm-none-eabi-nm
 HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)