diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 2917076..d159e5d 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -131,6 +131,9 @@
       flag_group {
         flag: "-DAOS_DEBUG=1"
       }
+      flag_group {
+        flag: "-fno-omit-frame-pointer"
+      }
     }
   }
 
@@ -224,6 +227,8 @@
   # Enable coloring even if there's no attached terminal. Bazel removes the
   # escape sequences if --nocolor is specified.
   compiler_flag: "-fcolor-diagnostics"
+  compiler_flag: "-fmessage-length=80"
+  compiler_flag: "-fmacro-backtrace-limit=0"
 
   compiler_flag: "-Wall"
   compiler_flag: "-Wextra"
@@ -373,6 +378,9 @@
       flag_group {
         flag: "-DAOS_DEBUG=1"
       }
+      flag_group {
+        flag: "-fno-omit-frame-pointer"
+      }
     }
   }
 
@@ -395,15 +403,9 @@
   feature {
     name: "all_modes"
     flag_set {
-      action: "c-compile"
-      flag_group {
-        flag: "-std=gnu99"
-      }
-    }
-    flag_set {
       action: "preprocess-assemble"
       action: "assemble"
-      action: "c++-link"
+      action: "c-compile"
       flag_group {
         flag: "-std=gnu99"
       }
@@ -433,6 +435,10 @@
     }
   }
 
+  compiler_flag: "-mfpu=neon"
+  # TODO(brians): See if it will run with this enabled.
+  #compiler_flag: "-mhwdiv=arm,thumb"
+
   # Anticipated future default.
   # This makes GCC and Clang do what we want when called through symlinks.
   unfiltered_cxx_flag: "-no-canonical-prefixes"
@@ -484,6 +490,7 @@
   compiler_flag: "-Wsign-compare"
   compiler_flag: "-Wformat=2"
   compiler_flag: "-Werror"
+  compiler_flag: "-Wunused-local-typedefs"
 
   # Keep stack frames for debugging, even in opt mode.
   compiler_flag: "-fno-omit-frame-pointer"