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
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index c206675..c3dd8e8 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -23,9 +23,6 @@
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 5c050fa..1b09242 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -28,9 +28,6 @@
}
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 92cd98b..44ad30b 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -56,6 +56,8 @@
"-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 9b5d4d9..97d6a72 100644
--- a/cc/config/mips64_device.go
+++ b/cc/config/mips64_device.go
@@ -25,7 +25,6 @@
"-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 a8c48b4..9cd8b5f 100644
--- a/cc/config/mips_device.go
+++ b/cc/config/mips_device.go
@@ -25,7 +25,6 @@
"-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 1eab9dd..e461c45 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -24,7 +24,6 @@
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 8aea64d..8fd65f7 100644
--- a/cc/config/x86_device.go
+++ b/cc/config/x86_device.go
@@ -24,7 +24,6 @@
x86Cflags = []string{
"-finline-functions",
"-finline-limit=300",
- "-fno-short-enums",
"-funswitch-loops",
}