diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 5bdf8f8..39f29d8 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -631,14 +631,13 @@
         flag: "-Wpointer-arith"
         flag: "-Wstrict-aliasing"
         flag: "-Wcast-qual"
-        flag: "-Wcast-align"
         flag: "-Wwrite-strings"
         flag: "-Wtype-limits"
         flag: "-Wsign-compare"
         flag: "-Wformat=2"
         flag: "-Werror"
         flag: "-Wunused-local-typedefs"
-        flag: "-Wno-cast-align"
+        flag: "-Wno-psabi"
         flag: "-fno-omit-frame-pointer"
         flag: "-D__has_feature(x)=0"
         flag: "-pipe"
diff --git a/tools/cpp/static_crosstool.pb b/tools/cpp/static_crosstool.pb
index 8b46fe7..8552dff 100644
--- a/tools/cpp/static_crosstool.pb
+++ b/tools/cpp/static_crosstool.pb
@@ -613,14 +613,14 @@
         flag: "-Wpointer-arith"
         flag: "-Wstrict-aliasing"
         flag: "-Wcast-qual"
-        flag: "-Wcast-align"
         flag: "-Wwrite-strings"
         flag: "-Wtype-limits"
         flag: "-Wsign-compare"
         flag: "-Wformat=2"
         flag: "-Werror"
         flag: "-Wunused-local-typedefs"
-        flag: "-Wno-cast-align"
+        # We don't use libraries compiled with the broken version.
+        flag: "-Wno-psabi"
 
         # Keep stack frames for debugging, even in opt mode.
         flag: "-fno-omit-frame-pointer"