From 45d38c06b4183be58ae56ec61c019d371312357d Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 15 Jan 2016 16:38:46 -0800
Subject: [PATCH] Pass the arm/thumb cflags to assembly files

This effectively changes the default instruction set of assembly files
from arm to thumb in order to match the default for C/C++.

Change-Id: I8684f144a1195b53b3e0fdd04cacf77f6a131c7e
---
 core/binary.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/binary.mk b/core/binary.mk
index 73d1d22430..b86c7b8ea8 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -905,6 +905,7 @@ $(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \
 endif
 
 gen_asm_objects := $(gen_S_objects) $(gen_s_objects)
+$(gen_asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
 
 ###########################################################
 ## o: Include generated .o files in output.
@@ -1041,6 +1042,7 @@ $(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \
 endif
 
 asm_objects := $(dotdot_objects_S) $(dotdot_objects_s) $(asm_objects_S) $(asm_objects_s)
+$(asm_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
 
 
 # .asm for x86/x86_64 needs to be compiled with yasm.