Version change.

Signed-off-by: fruffy <[email protected]>
p4lang · Aug 13, 2024 · 7c2aae3 · 7c2aae3
1 parent fdcc225
commit 7c2aae3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/backends/p4tools/cmake/Z3.cmake b/backends/p4tools/cmake/Z3.cmake
@@ -47,7 +47,7 @@ macro(p4tools_obtain_z3)
     fetchcontent_declare(
       z3
       GIT_REPOSITORY https://github.com/Z3Prover/z3.git
-      GIT_TAG 51fcb10b2ff0e4496a3c0c2ed7c32f0876c9ee49 # 4.13.0
+      GIT_TAG bf34600f08d732680f7a9b3d85a257caf435418b # 4.13.0
       GIT_PROGRESS TRUE
       # GIT_SHALLOW TRUE
       # We need to patch because the Z3 CMakeLists.txt also adds an uinstall target.

diff --git a/backends/p4tools/cmake/z3.patch b/backends/p4tools/cmake/z3.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba3ec7bce..7ca1894fd 100644
+index cdccb8e4b..874c59bf3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -446,13 +446,13 @@ configure_file(

diff --git a/cmake/BDWGC.cmake b/cmake/BDWGC.cmake
@@ -4,7 +4,7 @@ macro(p4c_obtain_bdwgc)
     "Look for a preinstalled version of BDWGC in the system instead of installing a prebuilt binary using FetchContent."
     OFF
   )
-  set(LIBGC_LIBRARIES gc gccpp cord)
+  set(LIBGC_LIBRARIES gc gctba cord)
   set(HAVE_LIBGC 1)
 
   if(P4C_USE_PREINSTALLED_BDWGC)
@@ -37,12 +37,12 @@ macro(p4c_obtain_bdwgc)
     fetchcontent_declare(
       bdwgc
       GIT_REPOSITORY https://github.com/ivmai/bdwgc.git
-      GIT_TAG e340b2e869e02718de9c9d7fa440ef4b35785388 # 8.2.6
+      GIT_TAG 7f1503dbfe254e77678666a0e09b735add064b57 # 8.2.6
       GIT_PROGRESS TRUE
-      PATCH_COMMAND
-        git apply ${P4C_SOURCE_DIR}/cmake/bdwgc.patch || git apply
-        ${P4C_SOURCE_DIR}/cmake/bdwgc.patch -R --check && echo
-        "Patch does not apply because the patch was already applied."
+      # PATCH_COMMAND
+      #   git apply ${P4C_SOURCE_DIR}/cmake/bdwgc.patch || git apply
+      #   ${P4C_SOURCE_DIR}/cmake/bdwgc.patch -R --check && echo
+      #   "Patch does not apply because the patch was already applied."
     )
     fetchcontent_makeavailable_but_exclude_install(bdwgc)
 
@@ -54,8 +54,8 @@ macro(p4c_obtain_bdwgc)
     # Add some extra compile definitions which allow us to use our customizations.
     # SKIP_CPP_DEFINITIONS to enable static linking without producing duplicate symbol errors.
     # GC_USE_DLOPEN_WRAP needs to be enabled to handle threads correctly. This option is usually active with "enable_redirect_malloc" but we currently supply our own malloc overrides.
-    target_compile_definitions(gc PUBLIC GC_USE_DLOPEN_WRAP SKIP_CPP_DEFINITIONS)
-    target_compile_definitions(gccpp PUBLIC GC_USE_DLOPEN_WRAP SKIP_CPP_DEFINITIONS)
+    target_compile_definitions(gc PUBLIC GC_USE_DLOPEN_WRAP SKIP_CPP_DEFINITIONS _GNU_SOURCE)
+    target_compile_definitions(gccpp PUBLIC GC_USE_DLOPEN_WRAP SKIP_CPP_DEFINITIONS _GNU_SOURCE)
 
     # Set up temporary variable modifications for check_symbol_exists.
     set(CMAKE_REQUIRED_INCLUDES_PREV ${CMAKE_REQUIRED_INCLUDES})

diff --git a/lib/gc.cpp b/lib/gc.cpp
@@ -31,7 +31,8 @@ limitations under the License.
 #if HAVE_LIBGC
 #include <gc.h>
 #include <gc_cpp.h>
-#include <gc_mark.h>
+
+#include <gc/gc_mark.h>
 #endif /* HAVE_LIBGC */
 #include <sys/mman.h>
 #if HAVE_EXECINFO_H
@@ -299,7 +300,7 @@ static void gc_callback() {
     }
 }
 
-void silent(char *, GC_word) {}
+void silent(const char *, GC_word) {}
 
 void reset_gc_logging() {
     gc_logging_level = Log::Detail::fileLogLevel(__FILE__);