From ea3141d06d611fdb3d9beb48dc0a0a30d944076c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 6 Nov 2017 14:02:02 -0800
Subject: [PATCH] Move some flags to affect all devices

Move -fdata-sections and -fno-short-enums to global device flags.
-fdata-sections was not previously set on x86[_64], -fno-short-enums
was not previously set on mips[64].

Bug: 68855788
Test: m checkbuild
Change-Id: I68e64888d5414fc022366eb2b6c5cd92c28a5542
---
 cc/config/arm64_device.go  | 3 ---
 cc/config/arm_device.go    | 3 ---
 cc/config/global.go        | 2 ++
 cc/config/mips64_device.go | 1 -
 cc/config/mips_device.go   | 1 -
 cc/config/x86_64_device.go | 1 -
 cc/config/x86_device.go    | 1 -
 7 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index c206675fe..c3dd8e840 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -23,9 +23,6 @@ import (
 
 var (
 	arm64Cflags = []string{
-		"-fdata-sections",
-		"-fno-short-enums",
-
 		// Help catch common 32/64-bit errors.
 		"-Werror=implicit-function-declaration",
 
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index 5c050fa5a..1b09242e7 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -28,9 +28,6 @@ var (
 	}
 
 	armCflags = []string{
-		"-fdata-sections",
-		"-fno-short-enums",
-
 		"-fno-builtin-sin",
 		"-fno-strict-volatile-bitfields",
 
diff --git a/cc/config/global.go b/cc/config/global.go
index 92cd98b4c..44ad30b43 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -56,6 +56,8 @@ var (
 		"-fdiagnostics-color",
 
 		"-ffunction-sections",
+		"-fdata-sections",
+		"-fno-short-enums",
 		"-funwind-tables",
 		"-fstack-protector-strong",
 		"-Wa,--noexecstack",
diff --git a/cc/config/mips64_device.go b/cc/config/mips64_device.go
index 9b5d4d91d..97d6a7201 100644
--- a/cc/config/mips64_device.go
+++ b/cc/config/mips64_device.go
@@ -25,7 +25,6 @@ var (
 		"-fomit-frame-pointer",
 		"-funswitch-loops",
 		"-Umips",
-		"-fdata-sections",
 
 		// Help catch common 32/64-bit errors.
 		"-Werror=implicit-function-declaration",
diff --git a/cc/config/mips_device.go b/cc/config/mips_device.go
index a8c48b4b6..9cd8b5fb0 100644
--- a/cc/config/mips_device.go
+++ b/cc/config/mips_device.go
@@ -25,7 +25,6 @@ var (
 		"-fomit-frame-pointer",
 		"-funswitch-loops",
 		"-Umips",
-		"-fdata-sections",
 
 		// TARGET_RELEASE_CFLAGS
 		"-fgcse-after-reload",
diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go
index 1eab9dd65..e461c457f 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -24,7 +24,6 @@ var (
 	x86_64Cflags = []string{
 		"-finline-functions",
 		"-finline-limit=300",
-		"-fno-short-enums",
 		"-funswitch-loops",
 
 		// Help catch common 32/64-bit errors.
diff --git a/cc/config/x86_device.go b/cc/config/x86_device.go
index 8aea64d9c..8fd65f7ac 100644
--- a/cc/config/x86_device.go
+++ b/cc/config/x86_device.go
@@ -24,7 +24,6 @@ var (
 	x86Cflags = []string{
 		"-finline-functions",
 		"-finline-limit=300",
-		"-fno-short-enums",
 		"-funswitch-loops",
 	}