From 31d4f485c81e1ee109c6f629365780069b0517b8 Mon Sep 17 00:00:00 2001
From: krcroft <krcroft@users.noreply.github.com>
Date: Sat, 11 Apr 2020 13:53:28 -0700
Subject: [PATCH] Add aliasing warnings to the warnmore target

---
 scripts/automator/build/clang-defaults | 12 ++++++++----
 scripts/automator/build/gcc-defaults   | 16 ++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/scripts/automator/build/clang-defaults b/scripts/automator/build/clang-defaults
index d0cb140f..3d57c0fe 100644
--- a/scripts/automator/build/clang-defaults
+++ b/scripts/automator/build/clang-defaults
@@ -14,14 +14,18 @@ TYPES+=(release debug warnmore pgotrain optinfo msan usan)
 cflags_release+=("${cflags[@]}" -DNDEBUG -O3 -fno-math-errno
                  -fno-strict-aliasing)
 cflags_debug+=("${cflags[@]}" -g -fno-omit-frame-pointer)
+
+cflags_warnmore+=("${cflags_debug[@]}" -Wextra -Wshadow -Wcast-align -Wunused
+                  -Woverloaded-virtual -Wpedantic -Wconversion -Wsign-conversion
+                  -Wdouble-promotion -Wformat=2 -fstrict-aliasing -Wstrict-aliasing=2)
+cxxonly_warnmore+=(-Wnon-virtual-dtor -Woverloaded-virtual)
+
 cflags_pgotrain+=("${cflags_debug[@]}" -fprofile-instr-generate
                   -fcoverage-mapping)
-cflags_warnmore+=("${cflags_debug[@]}" -Wextra -Wshadow -Wcast-align
-                  -Wunused -Woverloaded-virtual -Wpedantic -Wconversion
-                  -Wsign-conversion -Wdouble-promotion -Wformat=2)
-cxxonly_warnmore+=(-Wnon-virtual-dtor -Woverloaded-virtual)
+
 cflags_optinfo+=("${cflags_release[@]}" -Rpass-analysis=loop-vectorize
                  -gline-tables-only -gcolumn-info)
+
 cflags_msan=("${cflags_debug[@]}" -fsanitize-recover=all -fPIE -pie
              -fsanitize=memory -fno-omit-frame-pointer)
 cflags_usan=("${cflags_debug[@]}" -fsanitize-recover=all
diff --git a/scripts/automator/build/gcc-defaults b/scripts/automator/build/gcc-defaults
index a0ea354b..ea5386a2 100644
--- a/scripts/automator/build/gcc-defaults
+++ b/scripts/automator/build/gcc-defaults
@@ -18,17 +18,21 @@ cflags_debug+=("${cflags[@]}" -g -fno-omit-frame-pointer)
 cflags_release+=("${cflags[@]}" -DNDEBUG -O3 -fstrict-aliasing
                  -fno-signed-zeros -fno-trapping-math -fassociative-math
                  -frename-registers -ffunction-sections -fdata-sections)
-cflags_pgotrain+=("${cflags_debug[@]}" -pg -ftree-vectorize)
-cflags_warnmore+=("${cflags_debug[@]}" -pedantic -Wcast-align
-                  -Wdouble-promotion -Wduplicated-branches
-                  -Wduplicated-cond -Wextra -Wformat=2 -Wlogical-op
-                  -Wmisleading-indentation -Wnull-dereference -Wshadow
-                  -Wunused)
+
+cflags_warnmore+=("${cflags_debug[@]}" -pedantic -Wcast-align -Wdouble-promotion
+                  -Wduplicated-branches -Wduplicated-cond -Wextra -Wformat=2
+                  -Wlogical-op -Wmisleading-indentation -Wnull-dereference
+                  -Wshadow -Wunused -fstrict-aliasing -Wstrict-aliasing=2)
 cxxonly_warnmore+=(-Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual
                    -Wuseless-cast)
+
+cflags_pgotrain+=("${cflags_debug[@]}" -pg -ftree-vectorize)
+
 cflags_fdotrain+=("${cflags[@]}" -DNDEBUG -g1 -fno-omit-frame-pointer)
+
 cflags_optinfo+=("${cflags_release[@]}" -fopt-info-missed
                  -ftree-vectorizer-verbose=6)
+
 cflags_asan+=("${cflags_debug[@]}" -fsanitize=address)
 ldflags_asan+=(-static-libasan)
 cflags_uasan+=("${cflags_debug[@]}" -fsanitize=address,undefined