From 13af54da2d8d74b96133bb5a58a6a9fb564b8445 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 16 Mar 2015 16:12:05 -0700
Subject: [PATCH] Fix arm compile flags to match makefile build

Fix a few flags that don't match the makefile build flags in
build/core/combo/TARGET_linux-arm.mk

Change-Id: Ib951da32d7828aff17a32f10ba18ed678b3571de
---
 cc/arm_device.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cc/arm_device.go b/cc/arm_device.go
index d07093504..e33bd01bc 100644
--- a/cc/arm_device.go
+++ b/cc/arm_device.go
@@ -11,8 +11,7 @@ var (
 	armCflags = []string{
 		"-fno-exceptions", // from build/core/combo/select.mk
 		"-Wno-multichar",  // from build/core/combo/select.mk
-		"-fno-strict-aliasing",
-		"-fstack-protector",
+		"-msoft-float",
 		"-ffunction-sections",
 		"-fdata-sections",
 		"-funwind-tables",
@@ -48,7 +47,7 @@ var (
 		"-Wl,--build-id=md5",
 		"-Wl,--warn-shared-textrel",
 		"-Wl,--fatal-warnings",
-		"-Wl,-icf=safe",
+		"-Wl,--icf=safe",
 		"-Wl,--hash-style=gnu",
 
 		// Disable transitive dependency library symbol resolving.