Review comments.

Signed-off-by: fruffy <[email protected]>

cmake/z3.patch

@@ -1,36 +1,26 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba3ec7bce..7ca1894fd 100644
+index ba3ec7bc..68fae9c8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -446,13 +446,13 @@ configure_file(
+@@ -446,7 +446,7 @@ configure_file(
 
  # Target needs to be declared before the components so that they can add
  # dependencies to this target so they can run their own custom uninstall rules.
 -add_custom_target(uninstall
--  COMMAND
--  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
--  COMMENT "Uninstalling..."
--  USES_TERMINAL
--  VERBATIM
--)
-+# add_custom_target(uninstall
-+#   COMMAND
-+#   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-+#   COMMENT "Uninstalling..."
-+#   USES_TERMINAL
-+#   VERBATIM
-+# )
-
- ################################################################################
- # CMake build file locations
++add_custom_target(z3_uninstall
+   COMMAND
+   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+   COMMENT "Uninstalling..."
 diff --git a/src/util/memory_manager.cpp b/src/util/memory_manager.cpp
-index 290881ba5..a3db94d7a 100644
+index 290881ba..d07ba239 100644
 --- a/src/util/memory_manager.cpp
 +++ b/src/util/memory_manager.cpp
-@@ -29,6 +29,8 @@ Copyright (c) 2015 Microsoft Corporation
+@@ -29,6 +29,10 @@ Copyright (c) 2015 Microsoft Corporation
  # define malloc_usable_size _msize
  #endif
 
++// malloc_usable_size() currently does not work with BDWGC which is used by P4C. We disable it.
++// FIXME: Find a way to patch BDWGC to allow malloc_usable_size() to work.
 +#undef HAS_MALLOC_USABLE_SIZE
 +
  // The following two function are automatically generated by the mk_make.py script.